schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,234 Commits 322 Branches 1,581 Tags
07924d3c7cb1567ff737656552c8a7fe6046a7f3
Commit Graph

1317 Commits

Author SHA1 Message Date
Himanshu
6dbb02d293 fix: show searchfields result (#21760) 2020-05-18 14:26:43 +05:30
Saqib Ansari
b47f5830f4 fix: purchase inv shows overdue for fraction of outstanding 2020-05-12 14:13:16 +05:30
Saqib
10ea82001f chore: fix error message (#21594) 
* chore: fix error message

* chore: add row idx
 2020-05-05 16:14:12 +05:30
Marica
ed709b36b4 fix: variable referenced before assignment (#21561) 2020-05-02 17:55:47 +05:30
Marica
fa7d496413 fix: Blanket Order in SO/PO child tables (#21444) 2020-04-28 13:00:51 +05:30
Deepesh Garg
d771ba2895 Merge pull request #21398 from nextchamp-saqib/tax-breakup-for-cn-v12 
fix: show positive taxes in credit notes
 2020-04-24 19:01:46 +05:30
Saqib Ansari
6256ca81b1 fix: show positive taxes in credit notes 2020-04-24 16:01:11 +05:30
Deepesh Garg
bd4b5da11b feat: Payment allocation based on payment terms (#20946) 
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:09:08 +05:30
rohitwaghchaure
f2c43ca81e fix: patch and validation message to fix target warehouse issue (#21359) 2020-04-22 16:08:36 +05:30
Michelle Alva
499f9198b9 fix: better error message due date (#21366) 2020-04-22 11:37:09 +05:30
Nabin Hait
3b2aa5ead3 fix: requested qty for customer provided item and rate for sales (#21300) 
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
 2020-04-17 10:52:23 +05:30
Saqib Ansari
4879858657 fix: warehouse unset when cannot find item warehouse 
* cannot set delivery date when all items gets deleted and new are added
 2020-04-15 22:08:12 +05:30
Rohan
b0f000b1c8 fix: order_type validation restriction (#18096) (#21264) 
Co-authored-by: Don-Leopardo <46027152+Don-Leopardo@users.noreply.github.com>
 2020-04-14 19:42:21 +05:30
Deepesh Garg
9d0af22b88 Merge pull request #21202 from marination/serial-no-status-hotfix 
fix: Added Status field in Serial No for filter and report builder
 2020-04-10 20:48:45 +05:30
marination
cdd589a58a fix: Status field in Serial No for filter and report builder 2020-04-08 16:08:09 +05:30
marination
dfe4d36e8d fix: Test Cases and block expense on outward entry 
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
 2020-04-03 18:29:30 +05:30
marination
7b70679bf0 fix: Mapping Customer Provided Material Request to Stock Entry 
- Fixed inability to map Material Request to Stock Entry
- Commonified Customer Provided Item validation
 2020-04-03 15:57:32 +05:30
Saqib
44dbd98d90 fix: cannot set warehouse on deleting all so items and updating them (#21079) 
* fix: cannot set warehouse on deleting all so items and updating them

* fix: travis

* fix: travis

* fix: docname is editable in update items dialog

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-04-03 10:01:14 +05:30
Saqib
f492ba1e2d fix: auto created asset message (#21109) 
* fix: auto created asset message

* Update erpnext/controllers/buying_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-31 10:48:57 +05:30
Deepesh Garg
83111a4a2a fix: Expense account currency validation in Landed Cost voucher (#21074) 
* fix: Expense account currency validation in Landed Cost voucher

* fix: Remove unused imports
 2020-03-31 10:45:37 +05:30
Saqib Ansari
8ba661b8ed chore: hyperlinks in cannot cancel message 2020-03-28 20:11:59 +05:30
Saqib
bc8a881e64 fix: purchase return are allowed even when assets are not cancelled (#20798) 
* fix: purchase return are allowed even when assets are not cancelled

* chore: test case

* fix: error message

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 17:00:24 +05:30
Nabin Hait
5c760175d1 fix: deletion of auto-created batch (#20953) 2020-03-16 17:26:02 +05:30
Nabin Hait
e2a31f221a fix: Multiple fixes for travis (#20950) 2020-03-16 15:36:10 +05:30
Nabin Hait
1f80c8dffe perf: improve gl entry submission (#20802) 
* perf: improve gl entry submission

* perf: add indexes

* fix: replace **kwargs with *args

* fix: syntax error

* fix: travis

* chore: remove purchase invoice from status updater

* fix: set_staus args

Co-Authored-By: Nabin Hait <nabinhait@gmail.com>

* fix: only update status for invoices & fees

* [bug][fix]: set status to object instead of variable (#20790)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saurabh <saurabh6790@gmail.com>
 2020-03-05 13:04:53 +05:30
Saqib
a6bf96322b chore: control reposting of future gl entries with flags (#20775) 2020-03-02 15:19:28 +05:30
Saqib
27163e60bb feat: link serial no to batch no (#20779) 
* feat: link serial no to batch no

* fix: test cases
 2020-03-02 15:03:18 +05:30
Saqib
45329232b3 fix: only update items if rate or qty changed (#20743) 2020-02-27 12:51:23 +05:30
Marica
4e3ad9c3f2 fix: Lock stock ledger entries that are being reposted. (#20739) 
- If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.
 2020-02-26 18:51:35 +05:30
Deepesh Garg
b4e3146665 Merge pull request #20550 from nextchamp-saqib/so-update-items-warehouse-fix-v12 
fix: mandatory warehouse wrror while updating items after submission
 2020-02-10 12:09:38 +05:30
thefalconx33
c7e523cee4 fix: mandatory warehouse wrror while updating items after submission 2020-02-09 12:21:01 +05:30
Rohit Waghchaure
5860427bc5 delete the auto created batch 2020-01-23 17:43:30 +05:30
Rohit Waghchaure
144012a5de fix: unlink references from batch on cacnellation of stock transactions 2020-01-23 12:42:42 +05:30
Marica
6ba6ba27bd fix: Missing argument in status updater (#20284) 2020-01-15 19:22:21 +05:30
rohitwaghchaure
fed9e2861c fix: incorrect number of GL Entries error in stock entry (#20297) 2020-01-15 16:35:02 +05:30
Deepesh Garg
55bdaae3ee feat: Validity for Item taxes (#20136) 
* feat: Validity for Item taxes

* fix: Add HSN wise taxes

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
 2020-01-07 11:31:19 +05:30
rohitwaghchaure
55cf2477cd fix: incorrect batch fetched for the serialized items (#20118) 2019-12-30 13:27:10 +05:30
thefalconx33
82c5a2bf45 fix: don't allow deletion of items which has work order assigned to it 2019-12-27 17:08:57 +05:30
Saqib
6ea509f7f4 feat: allow adding and deleting of items in submitted SO & PO (#19912) 
* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
 2019-12-27 12:56:17 +05:30
Nabin Hait
4c4da06a71 fix: rounding adjustment while both inclusive tax and discount amount present 2019-12-25 14:00:51 +05:30
Sun Howwrongbum
9de6083dbf feat: consider expiry_date during Batch queries (#20064) 2019-12-24 12:29:05 +05:30
Rohit Waghchaure
59cecb29a0 fix: incorrect consumed qty for partial purchase receipt in subcontracting 2019-12-20 12:56:01 +05:30
Rohit Waghchaure
821166c628 fix: schedule date 2019-12-16 12:29:39 +05:30
Rohit Waghchaure
4e8e466a98 fix: pricing rule not working for production discount 2019-12-16 11:16:36 +05:30
Nabin Hait
bf0f26b4a4 fix: Service start and end date validation for deferred accounting (#19806) 2019-12-04 15:29:54 +05:30
Marica
0e1ef35968 fix: Item qty cannot be zero in Purchase Receipt (#19780) 2019-12-03 12:59:15 +05:30
Suraj Shetty
2b172ec4b4 fix: valuation of "finished good" item in purchase receipt (#19745) 
* fix: Remove redundant purchase orders and unwanted condition

* fix: [WIP] Purchase receipt value

* fix: Add raw material cost based on transfered raw material

* fix: get_qty_to_be_received

* fix: Remove debugger statement

* fix: Reset rm_supp_cost before setting subcontracted raw_materials

* test: Fix and modify tests for backflush_based_on_stock_entry

* fix: Add non stock items to Purchase Receipt from Purchase Order

* fix: Ignore valuation rate check for non stock raw material

* fix: Rename check all rows

* fix: Remove amount from test

* test: Fix item rate error

* fix: handling of serial nos in backflush

* fix: Add serial no. of raw materials

* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material

* fix: Raw material batch number selection in purchase receipt

* Update test_purchase_order.py
 2019-11-29 16:59:21 +05:30
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +05:30
Saqib
cd3976f7d2 Asset cancellation fix (#19671) 
* fix: remove asset movement mandatory fields

* fix: label for reference doctype
 2019-11-25 12:24:34 +05:30
Saqib
f37a46edea Fixed Asset Refactor Review fixes (#19665) 
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
 2019-11-22 16:32:50 +05:30