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

24019 Commits

Author SHA1 Message Date
rohitwaghchaure
f01856d7a9 fix: production plan incorrect work order qty (#23264) 
* fix: production plan incorrect work order qty

* added test case

* Update test_production_plan.py
 2020-10-16 15:19:23 +05:30
marination
e9b04dc727 fix: Payment Reconciliation client side validations 2020-10-16 12:36:13 +05:30
Saqib
2f71927af8
fix: fuel expense amount of vehicle log (#23632) 
* fix: fuel expense amount of vehicle log

* fix: undefined var employee_id in test

* fix: test
 2020-10-16 12:32:59 +05:30
Deepesh Garg
775e689ba9 fix: Add tests 2020-10-15 22:09:05 +05:30
Deepesh Garg
01a7297f69 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor 2020-10-15 17:13:29 +05:30
Rohit Waghchaure
5f465394a7 fix: serial no field is blank in stock reconciliation 2020-10-15 15:56:50 +05:30
rohitwaghchaure
79c1c4e3fb
Merge pull request #23398 from anupamvs/quality-procedure-v13 
fix: quality procedure parent
 2020-10-15 15:52:22 +05:30
Abhishek Balam
349fcfd6a5 fix: set default filters on unchecking box, code cleanup 2020-10-15 12:21:43 +05:30
Wolfram Schmidt
3959ed5bef
Update payment_term.json (#23644) 
added descriptions to fields to clarify input.
 2020-10-14 22:48:46 +05:30
Deepesh Garg
ddccec4f5d
Merge pull request #23643 from deepeshgarg007/payment_reco_cancel 
fix: Do not get cancelled vouchers in Payment Reconciliation
 2020-10-14 22:09:08 +05:30
Deepesh Garg
37c2ed269e fix: Do not get cancelled vouchers in Payment Reconciliation 2020-10-14 21:47:43 +05:30
Abhishek Balam
89419c9a30 fix: move get_shipping_address() from frappe to erpnext and fix references 2020-10-14 20:09:05 +05:30
Abhishek Balam
2f528c1c73 fix: gettext import and changed function order in address.py 2020-10-14 19:48:57 +05:30
Abhishek Balam
c0215d257c
Merge branch 'develop' into address_customisation 2020-10-14 19:33:16 +05:30
Abhishek Balam
6e9e7b4c7a fix: serverside validation overrides 2020-10-14 19:31:37 +05:30
Abhishek Balam
38b26c8f3e fix: added semicolons 2020-10-14 18:24:51 +05:30
rohitwaghchaure
f8ce64c0ca
Merge pull request #23443 from marination/rfq-email 
feat: Supplier Email Preview in RFQ
 2020-10-14 18:16:59 +05:30
Abhishek Balam
346ca568b7 fix: set company link in address when is_your_company_address is set 2020-10-14 18:11:04 +05:30
Mohammad Hasnain
b9dc13294d chore(UAE VAT 201) solve translations issues 2020-10-14 16:56:26 +05:30
Afshan
9e08b21e0b
fix: removing unused imports (#23633) 2020-10-14 15:44:52 +05:30
Saqib
577a7fe01d
fix: stock & account balance difference in fraction (#23635) 2020-10-14 15:44:30 +05:30
Mohammad Hasnain
dfc3993cec chore(UAE VAT 21): rename report 2020-10-14 12:21:36 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts (#23530) 
* fix: Chart of Accounts

* fix: Chart of Accounts with lower case "of"

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-14 10:29:53 +05:30
Anupam Kumar
31417864cb
fix: project value is missing from procurement-tracker (#23549) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:29:25 +05:30
Frappe PR Bot
d8ddc321f8
chore: Update translations (#23577) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:28:21 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d Merge branch 'develop' into UAE-VAT-Format 2020-10-14 00:26:57 +05:30
rohitwaghchaure
cb791330f6
Merge branch 'develop' into quality-procedure-v13 2020-10-13 23:39:45 +05:30
Rucha Mahabal
f625da2b8b
Merge branch 'develop' into enrollment-fixes 2020-10-13 23:24:42 +05:30
rohitwaghchaure
4d93bfebd8
Merge pull request #23622 from AfshanKhan/fix-billing-summary-report-precision 
fix: setting user defined precision instead of 2
 2020-10-13 22:46:02 +05:30
Rucha Mahabal
ff0917358c fix: test 2020-10-13 22:39:05 +05:30
Deepesh Garg
8a7886ac60
Merge pull request #23621 from frappe/address_template_luxembourg 
feat: add address template for luxembourg
 2020-10-13 21:31:51 +05:30
Deepesh Garg
71a58a8fd0
Merge pull request #23605 from marination/item-link-formatter 
fix: Item Link Formatter Behaviour
 2020-10-13 21:26:00 +05:30
Sun Howwrongbum
93da52941e
fix: consider rounded_total in returns (#23609) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-13 21:23:26 +05:30
Deepesh Garg
06268e5f57
Merge pull request #23623 from kennethsequeira/italy-fy 
fix: Fiscal Year and Tax Rates for Italy
 2020-10-13 20:29:51 +05:30
rohitwaghchaure
db0fefd92c
Merge pull request #23614 from aakvatech/patch-3 
feat: Add company and correct filter in bank reconciliation statement
 2020-10-13 19:59:31 +05:30
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
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
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
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
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
41067e204c
Merge branch 'develop' into print-uom-after-quantity-patch 2020-10-12 17:32:29 +05:30
Marica
6d935d4e48
Merge branch 'develop' into company-issue 2020-10-12 17:25:12 +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
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
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
marination
03975a692e fix: Perform Item Attribute Value Validation on Variants Only 2020-10-12 12:03:07 +05:30
Kevin Chan
7a86a77322 fix: Asset status after maintenance or repair 
Fix a bug where an **Asset**'s status is not being set to what it was
previously after an **Asset Repair** or **Asset Maintenance**.
 2020-10-12 11:30:36 +08:00
Deepesh Garg
c9ebef4d30
Merge pull request #23567 from nextchamp-saqib/restrict-future-posting 
chore: do not allow future transactions
 2020-10-11 20:55:38 +05:30
Anupam
2be23309bb fix: can't add child table in item price 2020-10-11 14:14:50 +05:30
Mohammad Hasnain
ac451b3a54 feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice 2020-10-11 01:40:22 +05:30
Mohammad Hasnain
fc2ace1a31 Merge branch 'develop' into UAE-VAT-Format 2020-10-10 22:06:06 +05:30
Mohammad Hasnain
72bcb56368 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-10 22:04:16 +05:30
Saqib Ansari
3d91d48b77 fix: validate only for stock transactions 2020-10-10 21:56:50 +05:30
rohitwaghchaure
ad9db89514
Merge pull request #23573 from deepeshgarg007/opening_jv 
fix: Opening Journal Entry via Data Import
 2020-10-10 13:16:41 +05:30
Deepesh Garg
e9c1098f5f
Merge pull request #23566 from michellealva/sales_team 
fix: Change name of Sales Team table
 2020-10-10 12:14:00 +05:30
rohitwaghchaure
1bcd84450c
Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk 
fix: Add lower deduction certificate in desk page
 2020-10-10 11:23:26 +05:30
rohitwaghchaure
01e23264a6
Merge pull request #23557 from KanchanChauhan/issue#23475-2 
feat: Supplier Sourced Items in BOM
 2020-10-10 11:17:53 +05:30
rohitwaghchaure
5065f8ac83
Merge pull request #23545 from tundebabzy/develop 
fix: pass self.flags.ignore_permissions to the ignore_permissions
 2020-10-10 11:11:57 +05:30
rohitwaghchaure
04ddf24ffe
Merge pull request #23572 from marination/payment-entry-list-view 
fix: Check if list view standard filter exists in Payment Entry
 2020-10-10 11:09:31 +05:30
rohitwaghchaure
9333a1dd54
Merge pull request #23570 from nextchamp-saqib/si-dashboard-fix 
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
 2020-10-10 11:08:37 +05:30
rohitwaghchaure
ea8ea4abb5
Merge pull request #23569 from marination/prod-order-reference-in-item 
fix: Remove Production Order reference from Item Validation
 2020-10-10 11:03:26 +05:30
Kanchan Chauhan
654c36ea99 feat: Supplier Sourced Items in BOM 2020-10-09 22:05:03 +05:30
Deepesh Garg
2676f96203 fix: Opening Journal Entry via Data Import 2020-10-09 21:58:38 +05:30
marination
07731c7735 fix: Check if list view standard filter exists in Payment Entry 2020-10-09 21:44:23 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491) 
* fix: update items after submission ignores precision

* chore: add test
 2020-10-09 21:19:25 +05:30
Saqib Ansari
d927c8efba fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard 2020-10-09 21:00:33 +05:30
marination
bd6d5eb5ac fix: Remove Production Order reference from Item Validation 2020-10-09 20:57:17 +05:30
michellealva
1bc7fc41a5 fix: Change name of Sales Team table 2020-10-09 16:01:13 +05:30
Saqib Ansari
776d8f72cf chore: do not allow future transactions 2020-10-09 15:36:11 +05:30