Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,114 Commits 3 Branches 0 Tags 1 GiB
6e9e6d2491
Commit Graph

33114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
2a8a2215d0
Merge pull request #23620 from anupamvs/lead-address 
fix: displaying mandatory address field in Lead form
 2020-10-13 19:54:44 +05:30
Kenneth Sequeira
3eec4e61ab fix: GST rates for Australia 2020-10-13 19:23:48 +05:30
Kenneth Sequeira
1b329aaa7b fix: json format fixes 2020-10-13 19:10:09 +05:30
Afshan
c359d3528f fix: setting user precision instead of default 2020-10-13 18:54:54 +05:30
Anupam
7db38058f3 fix: displayings mandatory address field in Lead form 2020-10-13 17:33:58 +05:30
Rucha Mahabal
fc8ced9958
Merge branch 'develop' into enrollment-fixes 2020-10-13 17:28:39 +05:30
Mangesh-Khairnar
51228b5ee3 fix: make response handling more descriptive 2020-10-13 17:10:16 +05:30
barredterra
9aa3e7a37d feat: address template for luxembourg 2020-10-13 13:35:33 +02:00
Marica
43d3176d62
Merge branch 'develop' into patch-3 2020-10-13 17:01:18 +05:30
Marica
0ed3e947ba
Merge branch 'develop' into rfq-email 2020-10-13 16:55:25 +05:30
Marica
9cd79b6859
Merge branch 'develop' into item-link-formatter 2020-10-13 16:54:28 +05:30
Marica
c5e139a542
fix: Travis (#23606) 
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places

* fix: Item Barcode and Test

* fix: Over Receipt on subcontracting test

* fix: POS Invoice and Loyalty Program Tests

* fix: POS serialized item test and subcontracting exploded items in PO

* fix: Subcontracting test considering sourced_by_supplier items

* fix: Make only one Additonal Salary List with overwrite set
 2020-10-13 16:53:10 +05:30
Anupam
3245eaaeb0 fix: displayings mandatory address field in Lead form 2020-10-13 15:35:10 +05:30
Marica
ae1c65cde7
Merge branch 'develop' into item-link-formatter 2020-10-13 15:05:53 +05:30
Anupam
528a75ae9b fix: review changes 2020-10-13 11:46:52 +05:30
justmejust
ed779a416c
Update ar.csv (#23490) 
these changes made to the file is critical and important for Arabic user of the this software .the changes made to make appropriate and more correct meaning fro example in the Blanket Orders from Costumers the previous translation meaning امر بطانية) ) which mean you have an order to get ta Blanket which used when  you want to sleep.
so i decided to make this changes and will continue update this translation file in the future.
 2020-10-13 11:46:02 +05:30
aakvatech
617892db20
feat: Add company and correct filter in bank statement reconciliation report filters 
If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created.

https://github.com/frappe/erpnext/issues/23613
 2020-10-13 08:18:59 +03:00
Marica
da83e09cb3
Merge pull request #23607 from marination/holiday_list 
fix: Convert dates to datetime.date before comparing in Holiday List
 2020-10-13 02:46:53 +05:30
marination
5b790a0095 fix: Convert dates to datetime.date before comparing in Holiday List 2020-10-13 02:37:55 +05:30
Kenneth Sequeira
968f61d8ba fix: add multiple VAT rates for Italy 2020-10-13 00:25:46 +05:30
Kenneth Sequeira
56d305b966 fix: update italy fiscal year 2020-10-13 00:07:52 +05:30
Deepesh Garg
1137d8bd33
Merge pull request #23476 from anupamvs/subscription-invoice-issue 
fix: Payment Schedule not fetching
 2020-10-12 20:34:43 +05:30
marination
824f48fd23 fix: Item Link Formatter Behaviour 2020-10-12 20:08:03 +05:30
Anupam Kumar
71c02a6e89
Merge branch 'develop' into subscription-invoice-issue 2020-10-12 19:41:31 +05:30
rohitwaghchaure
b3aeba1a1b
Merge pull request #23453 from frappe/validate_regional_germany 
feat: validate Sales Invoice for Germany
 2020-10-12 18:45:16 +05:30
Raffael Meyer
0975b961f9
Merge branch 'develop' into validate_regional_germany 2020-10-12 15:08:58 +02:00
Saqib
3daad224ad
fix: cannot merge pos invoice if validate selling price is checked (#23593) 
* fix: cannot merge pos invoice if validate selling price is checked

* fix: validate selling price

* fix: test

* chore: add test

* fix: error message
 2020-10-12 18:31:23 +05:30
Marica
9cc05bb83e
Merge branch 'develop' into rfq-email 2020-10-12 18:02:15 +05:30
rohitwaghchaure
4164d08d17
Merge pull request #23323 from marination/supplier-quotn-comparison 
feat: Supplier Quotation Comparison - v3
 2020-10-12 17:55:15 +05:30
Marica
73e16ca16a
Merge pull request #23554 from rohitwaghchaure/print-uom-after-quantity-patch 
fix: added patch to make custom field 'Print UOM after Quantity'
 2020-10-12 17:43:39 +05:30
Marica
41067e204c
Merge branch 'develop' into print-uom-after-quantity-patch 2020-10-12 17:32:29 +05:30
Marica
ea1da6e4b8
Merge pull request #23534 from anupamvs/company-issue 
fix: error log while creating company
 2020-10-12 17:25:57 +05:30
Marica
6d935d4e48
Merge branch 'develop' into company-issue 2020-10-12 17:25:12 +05:30
Marica
dc75fe2cb6
Merge pull request #23478 from marination/supplier-quotation-ux 
feat: Supplier Quotation UX fixes
 2020-10-12 17:17:27 +05:30
Marica
14b9c79ddc
Merge branch 'develop' into supplier-quotation-ux 2020-10-12 17:16:28 +05:30
Saqib
b332c5f06f
fix: sales invoice series gets overwritten with pos invoice series (#23479) 
* fix: sales invoice series gets overwritten with pos invoice series

* chore: show is consolidated only if sales invoice is pos
 2020-10-12 17:10:37 +05:30
Saqib
ebb0a6266a
fix: last purchase rate in item prices report (#23506) 
* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* chore: fetch last purchase rate from update stock purchase invoices
 2020-10-12 17:09:09 +05:30
Saqib
ebbe285872
feat: (report) POS Register (#23313) 
* feat: pos register report

* feat: group by fields in pos register

* chore: add paid amount column

* fix: (minor) remove redundant group by label
 2020-10-12 17:02:31 +05:30
rohitwaghchaure
a060f8c00b
Merge pull request #23524 from michellealva/employee_exit 
fix(Employee): Field level change in Exit section
 2020-10-12 16:23:54 +05:30
rohitwaghchaure
14e7656a57
Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status 
fix: Asset status after maintenance or repair
 2020-10-12 16:13:29 +05:30
rohitwaghchaure
80519b1098
Merge pull request #23596 from marination/item-attribute-validation-on-non-template-item 
fix: Perform Item Attribute Value Validation on Variants Only
 2020-10-12 16:12:02 +05:30
Marica
e9f0268d32
Merge branch 'develop' into item-attribute-validation-on-non-template-item 2020-10-12 15:26:34 +05:30
rohitwaghchaure
a57ad47cb8
Merge pull request #23538 from kennethsequeira/spellcheck 
chore: spell fixes for Condition
 2020-10-12 15:25:23 +05:30
Marica
bf0b948d0b
Merge pull request #23362 from marination/mr-ux 
fix: More MR UX fixes
 2020-10-12 15:22:29 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux 2020-10-12 15:17:32 +05:30
rohitwaghchaure
4e59abf0bf
Merge pull request #23583 from anupamvs/item-price 
fix: can't save item price after adding child table
 2020-10-12 15:15:50 +05:30
Rushabh Mehta
2bef986f14
Merge pull request #23450 from michellealva/jc 
fix: Change Error Message in Work Order
 2020-10-12 15:07:21 +05:30
Glen Whitney
6ec3dc5453
fix(asset): cannot create asset if cwip disabled and account not set (#23580) 
* Never add an asset GL entry if CWIP is not enabled

* fix: asset purchase with purchase invoice

* chore: allow enable cwip accounting only if cwip account is set

* fix: cannot create asset if cwip disabled and account not set

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2020-10-12 14:56:55 +05:30
Deepesh Garg
15d46040ff
fix: Do not consider opening entries for TDS calculation (#23597) 2020-10-12 12:39:08 +05:30
Anupam
efc3e1fa62 fix: Payment Schedule not fetching 2020-10-12 12:15:49 +05:30