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

30065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
ef0d26c161 feat: Validity for Item taxes (#20135) 
* feat: Validity for Item taxes

* fix: Trigger for gst hsn code

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
 2020-01-06 15:34:15 +05:30
rohitwaghchaure
b5f91bea90
Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request 
fix: incorrect party type in payment request
 2020-01-06 15:16:42 +05:30
Rohit Waghchaure
8641f9ce77 fix: party type in payment request 2020-01-06 15:07:06 +05:30
rohitwaghchaure
055012a7fb
Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate 
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
 2020-01-06 12:07:53 +05:30
rohitwaghchaure
fe2afc643e fix: incorrect valuation rate for finished good entry (#20165) 2020-01-06 11:51:43 +05:30
Deepesh Garg
92f3149a64
Merge pull request #20185 from mujeerhashmi/fee-write-off 
feat: Allow write-off for Fees doctype in journal entry.
 2020-01-06 08:09:16 +05:30
Himanshu
9496b8453f fix(plaid): change json structure (#20189) 2020-01-06 00:17:16 +05:30
Khushal Trivedi
4218c56bdc Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-01-04 18:23:55 +05:30
Khushal Trivedi
9e9f22b957 solved conflicts 2020-01-04 18:23:38 +05:30
Syed Mujeer Hashmi
03bf1a875f feat: Allow write-off for Fees doctype 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2020-01-04 13:26:42 +05:30
Marica
d03a5ac629
Merge pull request #20172 from nextchamp-saqib/item-min-qty 
ux: add description for minimum purchase qty
 2020-01-03 12:54:02 +05:30
Marica
159799c238
Merge branch 'develop' into item-min-qty 2020-01-03 12:13:00 +05:30
rohitwaghchaure
52c5fb33d7
Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop 
fix: ignore pricing rule for other item group
 2020-01-02 19:24:37 +05:30
thefalconx33
7a01367ef1 ux: add description for minimum purchase qty 2020-01-02 19:14:55 +05:30
Nabin Hait
328c4f9b92 fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company 2020-01-02 19:00:47 +05:30
Rohit Waghchaure
660a78b877 fix: ignore pricing rule for other item group 2020-01-02 17:31:09 +05:30
Deepesh Garg
7670f2354a
Merge pull request #20161 from deepeshgarg007/general_ledger_print 
fix: Show closing row in general ledger print
 2020-01-02 13:23:35 +05:30
deepeshgarg007
473b478883 fix: Show closing row in general ledger print 2020-01-02 12:22:04 +05:30
Raffael Meyer
5d6fada431 feat: add accounts and account types 2020-01-01 22:55:54 +01:00
Rucha Mahabal
2d293c585e fix(Subscription): pass start_date while computing next_schedu… (#20159) 2019-12-31 19:15:37 +05:30
Anurag Mishra
8554304616 fix: set currency to company default currency (#20157) 2019-12-31 17:23:31 +05:30
Rohan
938ba3efc4 feat: show item name in Item Price list view (#20156) 2019-12-31 17:21:07 +05:30
Saqib
440a3b75be fix: don't show transfer button if already items are supplied (#20154) 2019-12-31 17:20:04 +05:30
Nabin Hait
5748cde54b fix: minor field arrangements 2019-12-31 17:18:15 +05:30
Anurag Mishra
d2eae9fbcf fix: Atendance Request, Employee Skill Map, Leave Encashment form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
b57ec65812 fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
52d280067b fix: Leave Type form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
cfdbbcff70 fix: Employee incentive form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
39ecd6ee1e fix: Expense calim form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
ec9000b6b9 fix: Employee form UI 2019-12-31 17:18:14 +05:30
Anurag Mishra
bd6e8b9cec feat: Mark Unmarked Attendance (#20062) 
* feat: Mark Unmarked Attendance

* Update shift_type.py

* Update attendance_list.js

* Update attendance.py

* Update attendance.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-31 17:09:56 +05:30
Rohan
b73b347697 feat: add job applicant's email in job offer (#20153) 2019-12-31 17:09:02 +05:30
Javier Wong
5cc7648e9c [Fix] Allow Print Before Pay in POS (#20151) 
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
 2019-12-31 17:07:37 +05:30
Saqib
71649fe141 fix: customer credit limit label (#20152) 2019-12-31 17:05:34 +05:30
Deepesh Garg
2bc7e2881a
Merge pull request #20149 from nextchamp-saqib/rounded-total-ss 
feat: added provision to disable rounded total for salary slips
 2019-12-31 17:02:14 +05:30
thefalconx33
88de158378 feat: added provision to disable rounded total for salary slips 2019-12-31 15:27:30 +05:30
Saqib
cb7043fd9d fix: party account currency not fetched from account for SO (#20146) 2019-12-31 13:55:13 +05:30
Marica
5483f1a27e fix: Field 'other_charges_calculation' column type changed. (#20141) 2019-12-30 22:20:02 +05:30
Rucha Mahabal
3ac39ba28d fix: format currency field in bank and cash payment voucher print format (#20137) 2019-12-30 15:18:07 +05:30
rohitwaghchaure
9af557f9d7 fix: incorrect batch fetched for the serialized items (#20119) 
* fix: incorrect batch fetched for the serialized items

* Update stock_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-30 13:26:47 +05:30
Ishan Loya
fe0adc8b25 fix: read WIP warehouse from work order (#20131) 
* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked

* fix: remove skip_transfer in stock entry

Related to #10753
 2019-12-30 12:19:08 +05:30
rohitwaghchaure
59a835602a fix: service item's cost showing incorrect amount in stock entry (#20106) 2019-12-30 11:42:06 +05:30
Deepesh Garg
e90126f7ab
Merge pull request #20123 from nextchamp-saqib/so-update-items 
fix: don't allow deletion of items which has work order assigned to it
 2019-12-28 21:01:17 +05:30
Deepesh Garg
b914cf0a9d
Merge pull request #19815 from Mangesh-Khairnar/publish-item 
feat(marketplace): allow user to un-publish item
 2019-12-28 17:52:49 +05:30
Deepesh Garg
4f1fcdd4a7
Merge pull request #20125 from marination/stock-module-desk 
chore: Added Reports to Stock Module Desk
 2019-12-28 17:45:06 +05:30
marination
126a63af26 chore: Added Reports to Stock Module Desk 2019-12-27 17:18:27 +05:30
Rohan
901fe4785c fix: employee preferred email patch (#20116) 2019-12-27 17:07:35 +05:30
Ishan Loya
b2a1ae77ce Remove default BOM filter in Work Order (#20117) 
Not all companies use default BOM (e.g. construction companies, etc.)
 2019-12-27 17:06:34 +05:30
Marica
f4fbdf98d1 fix: Removed unneccesary Duplicate Entry Error. (#20120) 2019-12-27 16:53:05 +05:30
thefalconx33
2073eeb8fa fix: don't allow deletion of items which has work order assigned to it 2019-12-27 16:26:03 +05:30