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

33583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
ced3b13492 fix: Check for paid field 2020-12-12 19:31:05 +05:30
Deepesh Garg
68fce6d029 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix 2020-12-12 19:28:50 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company (#24021) 
* fix: Accounting for internal transfer invoices within same company

* fix: warehouse fetching

* fix: Linting issues

* fix: GL entry fixes and validation for intercompany account

* fix: Account naming changes and other fixes

* fix: Add test for internal transfer

* fix: Test Case

* fix: Add description for fields

* fix: Commonfied code

* fix: Map warehouse and serial no
 2020-12-11 21:30:39 +05:30
Mohammad Hasnain Mohsin Rajan
f8d6726990
fix(acc recv report): columns mismatch (#24109) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-12-11 13:28:23 +05:30
Rucha Mahabal
0953058650
Merge pull request #24012 from ruchamahabal/stock-entry-for-medication-entries 
feat(IPME): Button to create Stock Entry for Drug Shortage
 2020-12-11 12:55:33 +05:30
Marica
d857d70a96
Merge branch 'develop' into stock-entry-for-medication-entries 2020-12-10 20:44:10 +05:30
Marica
49eef672d3
Merge pull request #24090 from hasnain2808/update-barcode-if-scan-barcode-used 
fix: scan barcode does not update barcode item field in sales order
 2020-12-10 18:17:23 +05:30
Marica
3bc69e59ec
Merge branch 'develop' into update-barcode-if-scan-barcode-used 2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan
8abe7b91fe
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan
ce1ca28296
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:05 +05:30
Saqib
7acb42d6df
feat(POS): hide images & auto add item checkbox (#24102) 2020-12-10 16:22:01 +05:30
Deepesh Garg
009721a3b2
Merge pull request #24035 from nextchamp-saqib/abs-value-in-pf 
fix: get formatted value in 'taxes' print template
 2020-12-10 15:33:41 +05:30
Saqib
dc3e9f4216
fix: asset with value zero doesn't show up in fixed asset register (#24091) 2020-12-10 12:30:15 +05:30
Deepesh Garg
6e58260d26
Merge pull request #24082 from ruchamahabal/fix-item-details-in-reports 
feat(reports): get item details from Item document instead of the Transactions
 2020-12-09 18:28:28 +05:30
Marica
6cf36bfb0b
Merge pull request #24046 from kennethsequeira/cont-temp 
feat: add jinja templating in Contract Template
 2020-12-09 18:22:18 +05:30
Marica
4efbee57f3
Merge branch 'develop' into cont-temp 2020-12-09 17:33:26 +05:30
Mohammad Hasnain Mohsin Rajan
deaf2e80cb
fix: linting 2020-12-09 12:36:14 +05:30
Mohammad Hasnain
69514c4761 fix: scan barcode does not update barcode item field in sales order 2020-12-09 12:10:28 +05:30
rohitwaghchaure
08d57e3530
Merge pull request #24074 from hasnain2808/required-qty-multiplying-fix 
fix(Production Planning Report): incorrect required_qty
 2020-12-08 12:52:12 +05:30
Rucha Mahabal
fa950662b9 fix: import statement 2020-12-08 12:32:19 +05:30
Rucha Mahabal
db0bbfac97 feat(reports): get item details from Item doctype instead of the Transaction 2020-12-08 12:20:07 +05:30
Mohammad Hasnain
59dffb96b3 fix(Production Planning): incorrect required qty 2020-12-08 11:13:00 +05:30
Afshan
727b2f9b97
fix: throw an error when no pos profile exist (#24025) 
* fix: throw an error when no pos profile exist

* fix: throw an error when no pos profile exist

* fix: test cases

* fix: tests

* fix: test

* fix: space as indent

* fix: travis
 2020-12-08 09:45:19 +05:30
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search (#24055) 2020-12-08 09:43:29 +05:30
Anuja Pawar
d369710c65
fix: fixed home desk page (#24075) 
* fix: fixed home desk page

* fix: suggested changes

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: suggested changes

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-08 09:40:08 +05:30
Jannat Patel
797f0cfa61
fix: sales invoice add button from sales order dashboard (#24077) 
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2020-12-08 09:33:13 +05:30
Afshan
749d36a4dd
fix: double exception in payroll (#24078) 2020-12-08 09:32:04 +05:30
Afshan
01eca12fa7
fix: overriding po (#24022) 
* fix: overriding po

* fix: po

* fix: refactor condition

* fix: condition

* fix: missing code
 2020-12-08 09:27:56 +05:30
Marica
654a71e35a
Merge pull request #24065 from Anuja-pawar/company_fiscal_year_fix 
fix: Added TDS Payable account number and an error message
 2020-12-07 13:21:18 +05:30
Marica
34e142ec72
Merge pull request #24057 from ruchamahabal/fix-si-pos-return 
fix: paid amount in Sales Invoice POS return resets to 0
 2020-12-07 13:20:43 +05:30
Marica
724d03ec68
Merge branch 'develop' into fix-si-pos-return 2020-12-07 12:01:19 +05:30
Kenneth Sequeira
85af44b7ed fix: client side UX fixes 2020-12-07 11:18:20 +05:30
Anuja P
276a729b84 Merge branch 'company_fiscal_year_fix' of https://github.com/Anuja-pawar/erpnext into company_fiscal_year_fix 2020-12-07 11:13:23 +05:30
Anuja P
550cb9c78f fix: suggested changes 2020-12-07 11:11:00 +05:30
Kenneth Sequeira
00510e7f12 Merge branch 'cont-temp' of https://github.com/kennethsequeira/erpnext into cont-temp 
pull latest
 2020-12-07 10:56:30 +05:30
Anuja P
47b4b7009d Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix 
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
 2020-12-07 10:55:44 +05:30
Kenneth Sequeira
5f95ba57a8 fix: py code clean up and doc help 2020-12-07 10:45:13 +05:30
Rucha Mahabal
063be69b58
fix(patch): set update_modified to False while setting issue/opportunity metrics (#24073) 2020-12-07 10:41:05 +05:30
Marica
13dcd18ede
Merge branch 'develop' into cont-temp 2020-12-07 09:53:23 +05:30
Deepesh Garg
6c35767995
Merge pull request #24069 from deepeshgarg007/gstr_3b_report_ims 
fix: Show tax amount in base currencies
 2020-12-06 23:24:24 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return 
feat: Return tracking in PR/DN
 2020-12-06 22:43:34 +05:30
Deepesh Garg
cfeca0dc87 fix: Show tax amount in base currencies 2020-12-06 18:28:30 +05:30
Deepesh Garg
44276b4650
Merge pull request #24067 from frappe/michellealva-patch-1 
fix: Change validation message
 2020-12-06 17:13:19 +05:30
Michelle Alva
c9067e40cb
fix: Change validation message 
grammatical fix
 2020-12-06 10:48:32 +05:30
Anuja Pawar
6227c1e526
Merge branch 'develop' into company_fiscal_year_fix 2020-12-06 00:29:03 +05:30
Deepesh Garg
2d1cfae596 fix: fieldname 2020-12-05 22:44:45 +05:30
Deepesh Garg
ceefd66090
Merge pull request #24041 from saurabh6790/v13-patch-fixes-1 
fix: reload doctype number card link
 2020-12-05 22:43:46 +05:30
Anuja P
b6cf75d2a8 fix: error messsage indent fix 2020-12-05 22:25:17 +05:30
Anuja P
d3157c9347 Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix 
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
 2020-12-05 22:21:03 +05:30
Marica
2d255c02a6
Merge pull request #23559 from marination/debit-credit-opening-invoice-tool 
fix: Handle Account and Item None not found in Opening Invoice Creation Tool
 2020-12-05 17:56:13 +05:30