Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,489 Commits 3 Branches 0 Tags 1 GiB
0a937dc050
Commit Graph

39489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GangaManoj
582a7ae964 fix: Add totals row when Grouped By Invoice 2021-11-16 02:33:51 +05:30
GangaManoj
3aaf7cb408 fix: Remove default Totals row 2021-11-16 02:33:12 +05:30
Deepesh Garg
74ccaeb07d
Merge branch 'develop' into shipping-rule-updation-error 2021-11-15 20:34:05 +05:30
Rohan
043e3255d6
fix: remove item-item group name validation (#28392) 2021-11-15 19:41:17 +05:30
Deepesh Garg
ce06aaa0ae
Merge pull request #27735 from GangaManoj/fix-so-cancellation-message 
fix: Sales Order cancellation message
 2021-11-15 18:51:30 +05:30
Ankush Menat
54184e54ed fix: patch for naming series property setter 2021-11-15 18:18:22 +05:30
Ankush Menat
7fcaeca403 fix: don't make naming series mandatory for items 
Item variants are an exception, hence this needs to be checked
conditionally.
 2021-11-15 18:18:22 +05:30
marination
05ec7cce82 test: Purchase Receipt Received Qty 2021-11-15 17:49:14 +05:30
marination
afe1c45f7f fix: Sider + Fields UX 
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
 2021-11-15 17:17:29 +05:30
Sagar Sharma
2eccb7a1ca
fix: Work order creation from sales order (#28388) 
* fix: Work order creation from sales order

* chore: formatting

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-11-15 16:08:15 +05:30
marination
bb561ba7a8 fix: Server side test 
- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations
 2021-11-15 15:21:20 +05:30
Deepesh Garg
ccbb8c82b3
Merge branch 'develop' into fix-hsn_wise 2021-11-14 10:37:36 +05:30
Conor
03370c63c5
chore: minor typo correction in CONTRIBUTING (#28386) 2021-11-14 09:46:31 +05:30
Smit Vora
520f33b02f fix(regional): hsn_wise as false returns item_code 2021-11-14 08:10:53 +05:30
Ankush Menat
c0f06bc8e3
fix: validate hmac unconditionally (#28372) 2021-11-12 14:45:51 +05:30
Sagar Vora
6d3e9bce5f
fix(M-Pesa): validate type before executing get_doc (#28369) 2021-11-12 14:24:33 +05:30
Sagar Vora
24b048925b
fix(WooCommerce): always expect signature in webhook requests (#28367) 2021-11-12 14:08:02 +05:30
Sagar Sharma
a424310581
fix: Collapse Scrap Items in Job Card (#28362) 2021-11-12 13:50:30 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account 
fix: Default party account getting overriden in invoices
 2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7 fix: Default party account getting overriden in invoices 2021-11-12 12:39:30 +05:30
Sagar Sharma
944bf8da71
fix: Unable to edit supplier scorecard criteria name once created (#28348) 2021-11-11 19:49:41 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person 
fix: commission rate not fetch from sales person
 2021-11-11 19:11:31 +05:30
GangaManoj
1393f97ad5 fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair 2021-11-11 18:48:23 +05:30
GangaManoj
4668bb4be0 feat: Add 'Add Serial No' button in the Stock Items table 2021-11-11 18:42:25 +05:30
GangaManoj
abb535540a fix: Rename item to item_code 2021-11-11 18:41:16 +05:30
GangaManoj
1aed8c4b2f feat: Add Serial No field 2021-11-11 18:40:38 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report (#27987) 2021-11-11 13:55:21 +05:30
Deepesh Garg
fdb8e1855d
Merge pull request #28334 from deepeshgarg007/gstr_1_duplicate_items 
fix(India): Sales Invoice with duplicate items not showing correct taxable value
 2021-11-11 11:38:58 +05:30
Marica
18f9e3558e
Merge branch 'develop' into se-required-items-from-jc 2021-11-11 11:14:37 +05:30
Deepesh Garg
0dca97eb9f fix(India): Sales Invoice with duplicate items not showing correct taxable value 2021-11-10 21:07:48 +05:30
Ankush Menat
c96b5492db fix: reload doctype forcefully 2021-11-10 19:41:55 +05:30
Ankush Menat
b728597ef4 fix: use hotfix branches for patch tests 2021-11-10 19:41:55 +05:30
Subin Tom
af1fce0419 fix: check if shipping rule value exists 2021-11-10 16:49:12 +05:30
Subin Tom
18ae03d967 fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py 2021-11-10 15:57:41 +05:30
Anupam Kumar
3d012ad31d
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-10 14:55:53 +05:30
Anupam
1a7851b1ad fix: error message 2021-11-10 14:55:13 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query (#28321) 2021-11-10 13:06:55 +05:30
Ankush Menat
12e81df2b7 fix: default value for allow neg stock in repost_item_valuation 
Negative stock can be toggled back after queuing transactions, this
causes failure when repost is executed.

Now allow_negative_stock stock is set at time of queuing the repost job.
This means setting changes done afterwards won't affect already
submitted reposts.
 2021-11-10 13:05:14 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability 2021-11-10 12:36:54 +05:30
Ankush Menat
e498389b00 fix: ignore cancelled entries in incorrect balance qty report 2021-11-10 12:09:51 +05:30
Anupam
68dc42fb1f fix: function name [is_work_order_stopped -> is_work_order_closed] 2021-11-10 10:12:29 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
marination
1eb3ca2b86 fix: (travis) Production Plan Summary Report breaks if no WO 
- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError
 2021-11-09 23:07:28 +05:30
Anupam Kumar
6954dd6329
feat: Competitor Tagging in Opportunity and Quotation (#28050) 
* feat: Competitor Tagging in Opportunity and Quotation

* fix: review changes

* fix: linter issue

* fix: section label

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 19:36:27 +05:30
Ankush Menat
ccf84ae88a fix: patch to update job card status 2021-11-09 18:04:50 +05:30
Ankush Menat
fdfa39c231 fix: avoid mutating iterator while iterating over it 2021-11-09 18:04:50 +05:30
Ankush Menat
37799fe3dd fix: use completion qty instead of transfer quantity for JC status 2021-11-09 18:04:50 +05:30
Marica
031178224f
Merge branch 'develop' into se-required-items-from-jc 2021-11-09 17:33:20 +05:30
Wolfram Schmidt
6907ad8adb
fix: add Email option to contact email field (#28296) 
* Update warranty_claim.json

Added the Email in option field of Contact Email so you are able to create a notification mapping to this field as reciever.

* Update warranty_claim.json
 2021-11-09 17:32:57 +05:30
marination
e8d0c25dff fix: Partial Trabsfers against JC 
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup
 2021-11-09 17:29:29 +05:30