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

5321 Commits

Author SHA1 Message Date
Deepesh Garg
c26db6a606 fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:16:49 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870) 
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
 2020-04-26 20:08:52 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup (#20932) 
* chore: Purchase Order Form Cleanup

* fix: Get Items from popups cleanup

* fix: Shift Set Target Warehouse next to Supply Raw Materials.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-26 20:07:22 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab (#21399) 
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-04-26 17:45:57 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) 
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
 2020-04-25 14:52:05 +05:30
Diksha Jadhav
7b91617303 feat(accounting): show actual qty for warehouse in sales invoice 2020-04-25 00:02:32 +05:30
Saqib Ansari
40140c63dc fix: rate gets overwritten when pricing rule is set 2020-04-24 14:51:56 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms (#20945) 
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:07:36 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes (#21179) 
* fix: Rename bank account type doctypes

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-23 12:19:30 +05:30
Deepesh Garg
fa8396feb5
fix: Budget against accounting dimensions (#21268) 
* fix: Budget warning against custom accounting dimension

* fix: Codacy

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 10:34:57 +05:30
Nabin Hait
471cf95300
Update purchase_invoice_item.json 2020-04-22 11:46:31 +05:30
Chinmay Pai
8fb863da07
chore: remove oldfieldtype from purchase invoice item (#21365) 
fixes issue where framework expects data field type to be validated with
options either set to "Email" or "Phone".

removing oldfieldtype works for now, should be fixed inside framework

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-22 11:23:14 +05:30
Rohit Waghchaure
690855d3a1 fix: unsupported operand type issue in pricing rule 2020-04-22 02:49:48 +05:30
Marica
34bbd5b612
fix: Purchase Invoice Form Cleanup (#21230) 
* fix: Purchase Invoice Form Cleanup

* fix: Made Supplier field mandatory

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-21 13:00:14 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions (#21313) 2020-04-18 22:13:48 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print 
fix: account name not showing in the gl print
 2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154 fix: account name not showing in the gl print 2020-04-18 19:02:07 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop 
fix: minor issues
 2020-04-18 02:08:26 +05:30
Mangesh-Khairnar
bd14a64bfb fix: add label to gl entry 2020-04-17 19:52:47 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales (#21299) 
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
 2020-04-17 10:52:28 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes (#21296) 
* fix: Made received qty readonly and no-copy

* fix: Made release date mandatory

* fix: requested qty calculation fix for UOM
 2020-04-16 20:11:32 +05:30
Deepesh Garg
44c0c6c159
Merge branch 'develop' into asset-cat-validation 2020-04-16 11:23:52 +05:30
Deepesh Garg
17ab1592c7
Merge pull request #21265 from vishdha/chart_account_v13 
fix: Chart of account importer UX improved
 2020-04-16 11:21:05 +05:30
vishdha
5b36d15927 fix: fix Transalation 2020-04-16 11:13:43 +05:30
Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev 2020-04-15 23:48:27 +05:30
Saqib Ansari
34640777cd fix: pos not accessible without default customer 2020-04-15 22:10:43 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer 
feat: Provision to set Default Item Manufacturer
 2020-04-15 16:35:08 +05:30
Rohit Waghchaure
d0f6f1808b fix: minor issues 2020-04-14 17:26:58 +05:30
vishdha
5008be1db5 fix: message bold 2020-04-14 17:17:26 +05:30
vishdha
10a6f4bd05 fix: Chart of account importer UX improved 2020-04-14 17:17:26 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed (#21251) 2020-04-14 12:53:54 +05:30
Faris Ansari
64f01bddc8
fix: Set Price List in case of User Permissions (#21237) 
Frontport of #18968
 2020-04-14 11:51:48 +05:30
Vishal Dhayagude
b1c2f4ef22
fix: str object not callable (#21227) 2020-04-14 11:42:52 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor 
refactor: Healthcare Module
 2020-04-13 17:16:02 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation 2020-04-12 13:39:43 +05:30
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor 2020-04-10 20:32:37 +05:30
Deepesh Garg
470679f227 fix: SQL ssyntax error 2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0 Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters 2020-04-10 20:19:30 +05:30
Deepesh Garg
e2a5828f5e
Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix 
chore: hide redundant base received amount
 2020-04-10 20:17:56 +05:30
Deepesh Garg
669c5c6370
fix: Syntax Error 2020-04-10 20:15:53 +05:30
Deepesh Garg
550771058a
fix: Code styling 2020-04-10 20:14:29 +05:30
Rucha Mahabal
1ff0cfd4f9 fix: merge conflicts 2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
Saqib Ansari
c9d6630f17 fix: formatting 2020-04-10 12:43:54 +05:30
Saqib Ansari
debee1c977 fix: travis 2020-04-10 12:38:44 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor 2020-04-09 19:16:31 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry 
fix: Mapping Customer Provided Material Request to Stock Entry
 2020-04-09 13:18:25 +05:30
Deepesh Garg
ef220c1989
Merge branch 'develop' into pay-entry-ux-fix 2020-04-09 12:54:33 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. (#21206) 2020-04-09 12:01:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb (#21190) 2020-04-08 11:49:06 +05:30