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

27570 Commits

Author SHA1 Message Date
noahjacob
dd86642037 refactor: removed py2 code 2021-08-10 11:41:29 +05:30
noahjacob
b214e624bb style: fixed formatting 2021-08-10 11:41:29 +05:30
noahjacob
74bcb987f3 style: fixed formatting 2021-08-10 11:41:29 +05:30
noahjacob
4fb1b6b80c fix: Sider 2021-08-10 11:41:29 +05:30
noahjacob
a4cea1e56d refactor: variable names 2021-08-10 11:41:29 +05:30
noahjacob
3a663ac77f test: changed test item name 2021-08-10 11:41:29 +05:30
noahjacob
c95d96e7ae refactor: changed variable names 2021-08-10 11:41:29 +05:30
noahjacob
a9ef56a107 test: added test case for creating and updating 2021-08-10 11:41:29 +05:30
noahjacob
415519af15 feat: added multi-select fields to create multiple pricing rules. 2021-08-10 11:41:29 +05:30
rohitwaghchaure
c5e7673277
Merge pull request #26814 from noahjacob/mr_allowance_feat_v13 
feat: over transfer allowance for material transfers (bp #26264)
 2021-08-10 11:32:43 +05:30
Deepesh Garg
cd980f5e6b
Merge pull request #26723 from GangaManoj/backport-po-payment-terms 
feat: Fetch Payment Terms from linked Sales/Purchase Order
 2021-08-10 10:34:39 +05:30
Francisco Roldan
0a90302170 fix: depends_on in price list field 2021-08-09 11:41:56 -03:00
Frappe PR Bot
18bd182f61
patch: delete all orphaned tables docs (#26863) 2021-08-09 18:34:51 +05:30
Frappe PR Bot
0ff9ef673c
fix: add parameter for db insert while adding item tax (#26855) (#26858) 
(cherry picked from commit b3bbebd27c)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-09 17:58:18 +05:30
Ankush
9f5111809d
test: fix flaky purchase receipt test (#26859) (#26860) 
# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2021-08-09 15:35:26 +05:30
Frappe PR Bot
ea83e2b45f
fix: validate python expressions (#26835) (#26856) 
(cherry picked from commit 07337d5c78)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 14:48:59 +05:30
Saqib
e7a77d9cb1
Merge pull request #26415 from GangaManoj/backport-asset-repair-refactor 
refactor: Asset Repair
 2021-08-09 12:46:05 +05:30
Frappe PR Bot
210441d9b5
fix: price list with 0 value are ignored (bp #26655) 
* fix: price list with 0 value are ignored

Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
   zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
   would've changed.

Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.

* refactor: make get_price_list_rate function pure

(cherry picked from commit 16d4de5130)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 11:34:33 +05:30
Frappe PR Bot
3dfbf19e8f
fix: allow alternative items when using job card (bp #26724) 
(cherry picked from commit 7e0c57fa3f)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 11:33:55 +05:30
Frappe PR Bot
bba9aac9c0
feat: add french address template (bp #26316) 
* add french address template

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>

(cherry picked from commit 07e65ab589)
 2021-08-09 10:58:39 +05:30
Marica
e9c293d621
Merge pull request #25845 from noahjacob/item_so_variant_fix 
fix: production plan not fetching sales order of a variant
 2021-08-09 10:47:54 +05:30
Deepesh Garg
5ace2767af test: Fix test cases for payment terms fetch 2021-08-08 19:17:38 +05:30
Deepesh Garg
25d131a39f test: Improve test case for not coping payment terms 2021-08-07 17:39:40 +05:30
Deepesh Garg
a27ef14db6 fix: Override template only if setting is enabled 2021-08-07 00:12:57 +05:30
Deepesh Garg
a59a761f99 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms 2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
Frappe PR Bot
aec7846407
test: fix pricelist tests (#26839) (#26840) 
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.

(cherry picked from commit 27a29eb6bc)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-06 21:55:01 +05:30
Frappe PR Bot
9ea24db20a
test: use item that allows fractional UOM in test (#26837) (#26838) 
(cherry picked from commit 614336fe1d)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-06 21:14:40 +05:30
GangaManoj
fcbd79b7d3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-asset-repair-refactor 2021-08-06 18:12:24 +05:30
Frappe PR Bot
c8e6c07032
fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) (#26833) 2021-08-06 12:33:18 +05:30
Noah Jacob
cb44aed78b test: get sales order with variant 2021-08-06 11:16:25 +05:30
Deepesh Garg
ffd7642de2
Merge pull request #26832 from deepeshgarg007/budget_test_case 
test: Failing budget test due to project naming
 2021-08-06 11:14:47 +05:30
Frappe PR Bot
2e352834a2
fix: fetching of item tax from hsn code (#26736) (#26792) 
* fix: fetching of item tax from hsn code

(cherry picked from commit 3a50490c04)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-08-06 10:59:29 +05:30
Deepesh Garg
6871c07685 test: Failing budget test due to project naming 2021-08-06 10:53:38 +05:30
Frappe PR Bot
b13e46071a
fix: Let all System Managers be able to delete Company transactions (#26815) (#26819) 
(cherry picked from commit 884d8cf065)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-08-06 10:39:58 +05:30
Nabin Hait
894ed3a9a5
Merge pull request #26765 from frappe/revert-24206-additional_salary_tax_enhancements 
Revert "fix: Tax calculation for Recurring additional salary"
 2021-08-06 10:22:31 +05:30
GangaManoj
232c728636 Revert "fix: Only fetch default Payment Terms Template if present" 
This reverts commit fb80ca9e06.
 2021-08-05 23:04:58 +05:30
GangaManoj
fb80ca9e06 fix: Only fetch default Payment Terms Template if present 2021-08-05 22:04:11 +05:30
GangaManoj
5c21eea13d fix: Fetch discount details from Payment Terms only if Discount Type = Percentage 2021-08-05 21:50:09 +05:30
GangaManoj
e4a07d8ff3 fix: Stop fetching amount while fetching Payment Terms 2021-08-05 21:42:09 +05:30
Frappe PR Bot
6e07ec2617
fix: Do not fetch fully return issued purchase receipts (#26809) (#26825) 
(cherry picked from commit 1d90f7684e)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-05 20:13:28 +05:30
Noah Jacob
041ac339b1 style: improved formatting of sql query 2021-08-05 16:37:22 +05:30
Noah Jacob
b10465eebe refactor: created function to get bom_item for query 2021-08-05 16:37:22 +05:30
noahjacob
9b0b2daf4a refactor: updated sql query for item variants 2021-08-05 16:37:22 +05:30
noahjacob
cf4078756d fix: fixed fetching sales order of item variant in production plan 2021-08-05 16:37:21 +05:30
Frappe PR Bot
5b5a365aaf
fix: POS payment modes displayed wrong total (#26808) 2021-08-05 11:15:16 +05:30
GangaManoj
4a6ef9ab0f fix: Compare Payment Schedules 2021-08-05 00:52:55 +05:30
GangaManoj
0b11420147 fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-05 00:35:45 +05:30
GangaManoj
23c104555b fix: Remove irrelevant code 2021-08-05 00:28:42 +05:30
Frappe PR Bot
bf8d0c256d
fix: typo in error message (#26816) (#26817) 
(cherry picked from commit 005291e6dd)

Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
 2021-08-04 22:01:17 +05:30