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

36745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin D'souza
4e2e8daca9 fix(patch): Reload linked doctypes before renaming dt 2021-06-04 17:56:28 +05:30
Gavin D'souza
0b7da52ef1 fix(patch): Handle NULL values from fieldtype change 2021-06-04 17:07:45 +05:30
Sagar Vora
bd92b4339c perf: use frappe.get_value with wildcard instead of another frappe.get_doc call 2021-06-04 16:09:00 +05:30
Sagar Vora
5657fddb7a fix: improve filter for from_date; validation for joining and relieving date 2021-06-04 16:09:00 +05:30
Sagar Vora
e80902be8e fix: choose correct Salary Structure Assignment when getting data for formula eval 2021-06-04 16:09:00 +05:30
Ankush Menat
215516f819
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) (#25957) 
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr

Co-authored-by: D Tim Cummings <tim@triptera.com.au>
 2021-06-04 13:09:14 +05:30
D Tim Cummings
fb3ec7ccb8
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) 
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr
 2021-06-04 11:58:45 +05:30
Gavin D'souza
c68006b607 ci: Update ERPNext backup patch test >= v10 
* Generated v10 backup archive
    * used old v7 erpnext backup hosted via build.erpnext.com
    * upgraded to v10 frappe + erpnext
* Hosted backup on https://erpnext.com/files/v10-erpnext.sql.gz
 2021-06-04 11:49:56 +05:30
Gavin D'souza
8697e89441 chore: Drop < v10 patches from list 
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer

There are older version patches still left since they're being used in later ERPNext versions too.
 2021-06-04 11:49:56 +05:30
Gavin D'souza
5bf5775b43 chore: Drop old patches 
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
 2021-06-04 11:49:56 +05:30
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity (#25955) 2021-06-04 11:16:38 +05:30
Rucha Mahabal
3e92089200
fix: invalid 'depends_on' expression in opportunity (#25953) 2021-06-04 11:15:38 +05:30
Rohit Waghchaure
af4794b2d1 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-04 10:53:44 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice (#25775) 2021-06-04 10:08:22 +05:30
Saqib Ansari
4a1e270072 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos-fixes-8 2021-06-04 10:04:09 +05:30
GangaManoj
12d9e3b1e6 fix(Asset Repair): Add tests 2021-06-03 22:41:57 +05:30
GangaManoj
b55649f2ec fix(Asset): Add depreciation schedule details in create_asset() 2021-06-03 22:28:30 +05:30
rohitwaghchaure
25b953ad16
Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation 
fix: timeout error in the repost item valuation
 2021-06-03 22:14:22 +05:30
rohitwaghchaure
cd503ce01d
Merge pull request #25938 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-v13-pre 
fix: timeout error in the repost item valuation
 2021-06-03 22:14:01 +05:30
GangaManoj
aa9bbe51bd fix(Asset Repair): Add Company in GL Entries 2021-06-03 21:28:58 +05:30
GangaManoj
034f7bde33 fix(Asset Repair): Remove unnecessary condition 2021-06-03 21:12:43 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query (#25942) 2021-06-03 20:02:58 +05:30
Raffael Meyer
cee0ddea78
Merge pull request #25943 from rohitwaghchaure/fixed-filters-for-item-query-pre 
fix: filter type for item query
 2021-06-03 15:58:20 +02:00
Rohit Waghchaure
8449a47048 fix: filter type for item query 2021-06-03 18:32:28 +05:30
barredterra
c99eaf106e Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-03 14:17:43 +02:00
Rohit Waghchaure
4e10ce1632 fix: timeout error in the repost item valuation 2021-06-03 16:35:59 +05:30
Rohit Waghchaure
10558344b0 fix: timeout error in the repost item valuation 2021-06-03 16:34:31 +05:30
Marica
7437748a1d
Merge pull request #25805 from ankush/refactor_item 
refactor: item doctype
 2021-06-03 14:23:18 +05:30
Saqib Ansari
81b9a5ee47 fix(pos): cannot cancel consolidated sales invoice 2021-06-03 12:59:09 +05:30
Saqib Ansari
311b378328 fix(pos): searching items with barcode or serial no 2021-06-03 12:58:53 +05:30
rohitwaghchaure
40b90e5b6e
Merge pull request #25478 from noahjacob/prod_plan_feat 
feat: Added check box to combine items with same BOM
 2021-06-03 12:37:02 +05:30
gavin
3d5e15284b
Merge pull request #25850 from gavindsouza/rm-py2 
fix: Add future in requirements.txt
 2021-06-03 11:34:24 +05:30
Anoop
f899b3a633
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25921) 2021-06-03 09:24:31 +05:30
GangaManoj
9fb47795c4 fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked 2021-06-03 04:55:49 +05:30
GangaManoj
2ceeb8138d fix(Asset Repair): Set company when creating Stock Entry 2021-06-03 01:54:44 +05:30
GangaManoj
960840dc3a fix(Asset Repair): Set completion_date 2021-06-03 01:53:13 +05:30
Marica
e7d9200e0f
Merge pull request #25221 from Alchez/dev-quality-inspection-accounts 
feat: create Quality Inspections from account and stock documents
 2021-06-03 01:39:05 +05:30
Nabin Hait
0385ae2b43 Merge branch 'version-13-pre-release' into version-13 2021-06-02 22:14:20 +05:30
Nabin Hait
811f607c85 Merge branch 'version-13' into develop 2021-06-02 22:14:20 +05:30
Nabin Hait
8821d71094 bumped to version 13.4.1 2021-06-02 22:34:19 +05:50
barredterra
9affcd8f54 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-02 17:54:02 +02:00
Nabin Hait
88d94dbf0a
Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item 
fix: not able to select the item code in work order
 2021-06-02 19:00:34 +05:30
Nabin Hait
830e87a4dd
Merge pull request #25917 from rohitwaghchaure/fixed-work-order-no-able-to-select-item-pre 
fix: not able to select the item code in work order
 2021-06-02 18:59:41 +05:30
Raffael Meyer
f6627550d1
fix: remove wrong tax_category 2021-06-02 15:17:00 +02:00
barredterra
3c748efae3 feat: add Item Tax Templates for german COAs "SKR03" and "SKR04" 2021-06-02 13:27:15 +02:00
barredterra
b6f27a4cae feat: set is_default for german tax templates 2021-06-02 13:20:33 +02:00
barredterra
f259bf48aa refactor: make tax category 2021-06-02 13:20:03 +02:00
barredterra
e3557ff131 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-02 12:17:27 +02:00
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohit Waghchaure
5dd92934ae fix: not able to select the item code in work order 2021-06-02 14:27:24 +05:30