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

30593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syed Mujeer Hashmi
58a16f1a3b fix: GSTR 3B Report tax amount calculation 
The tax amount after discount amount should be considered for tax
calculation.

Fixes #21231

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2020-04-11 00:52:10 +05:30
Deepesh Garg
5e274965cc
Merge pull request #21201 from marination/serial-no-status 
fix: Added Status field in Serial No for filter and report builder
 2020-04-10 20:48:06 +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
Deepesh Garg
f7e216e285 fix: Employee loan fixes 2020-04-10 20:03:11 +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
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor 2020-04-09 19:16:31 +05:30
Rucha Mahabal
120d0e5796 fix: Fee Validity test 2020-04-09 19:16:01 +05:30
Deepesh Garg
724218418c
Merge pull request #21219 from frappe/michellealva-patch-1-1 
fix: better error message due date
 2020-04-09 17:38:48 +05:30
Michelle Alva
7f2477b72c
fix: better error message due date 
show better error message payment schedule due date
 2020-04-09 17:23:23 +05:30
Rucha Mahabal
d30023abac fix: failing tests 2020-04-09 16:43:13 +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
Nabin Hait
bd063c3fef
Update CODEOWNERS 2020-04-09 12:49:15 +05:30
Nabin Hait
2f5431378e
core: Added codeowners 2020-04-09 12:48:30 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. (#21206) 2020-04-09 12:01:10 +05:30
vishdha
0b34b90e71 fix: item_name added for message 2020-04-09 11:46:46 +05:30
marination
86e8b2a1c6 fix: Status field in Serial No for filter and report builder 2020-04-08 15:38:28 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields (#21199) 2020-04-08 12:59:15 +05:30
Mangesh-Khairnar
49816b0c5f
fix(MWS): add new regions to marketplace (#21196) 
* fix(MWS): add marketplace region for uae

* fix: rename the fields for mws integrations

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 12:57:14 +05:30
Saqib
562fd0eab0
fix: purchase return are allowed even when assets are not cancelled (#20797) 
* fix: purchase return are allowed even when assets are not cancelled

* chore: test case

* fix: error message

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 12:11:40 +05:30
rohitwaghchaure
47c8ddb29b
Merge pull request #20962 from marination/pick-list-enhance 
fix: Pick List Enhancements
 2020-04-08 12:09:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb (#21190) 2020-04-08 11:49:06 +05:30
Rucha Mahabal
8844e95667 fix: pass ignore_mandatory flags 2020-04-08 10:04:10 +05:30
Nabin Hait
04870ae23a
fix: Replace newlines with spaces before evaluation of condition and formula (#21165) 2020-04-08 09:34:46 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces (#21192) 2020-04-08 09:32:41 +05:30
Raffael Meyer
28753268e6
fix(regional): DATEV report: description in header, quote nonnumeric values (#21126) 
* fix description in header, quote nonnumeric values

* fix: truncate 'Buchungstext' to 60 chars
 2020-04-08 09:26:18 +05:30
Raffael Meyer
385a92d3f2
fix(patch): set_task_status (#21130) 
* fix(patch): set_task_status

* remove unnecessary loop, use tabs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 09:24:34 +05:30
Saqib
f93dc8dd88
fix: [ux] enforce 'get references from' in payment order (#21175) 2020-04-08 09:20:17 +05:30
Nabin Hait
b95a794e51
Merge branch 'develop' into healthcare_refactor 2020-04-08 09:08:21 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates (#19862) 
* feat: a central place for regional address templates

* set up address templates during install

* why don't the tests run?

* fix: remove unused variables, fix cwd

* fix: .get() dicts contents

* fix: choose the right default

* fix: fieldname is template, not html

* fix: import unittest

* fix: remove unnecessary code

* fix: ensure country exists

* fix: ensure country exists

* feat: test updating an existing template

* fix(regional): DuplicateEntryError in test_update_address_template

* refactor and set 'is_default'

* fix codacy

* fix: patch gst_fixes

* fix: patch update_address_template_for_india

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 08:56:57 +05:30
marination
3e7a8abf29 feat: Provision to set Default Item Manufacturer 
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
 2020-04-07 21:00:57 +05:30
rohitwaghchaure
36459c052f
Merge branch 'develop' into pick-list-enhance 2020-04-07 18:04:39 +05:30
rohitwaghchaure
0672b6b2e8
Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop 
fix: get serial nos based on posting date and time
 2020-04-07 18:02:49 +05:30
Nabin Hait
c9f08bed2b fix: set batch qty in batch master and test cases 2020-04-07 17:33:10 +05:30
Rohan Bansal
f92a5f32bd fix: set batch ID as title instead of item code 2020-04-07 17:33:10 +05:30
Rohan Bansal
d2d73e6cb7 fix: prioritize empty over expired as batch status 2020-04-07 17:33:10 +05:30
Rohan Bansal
ba03853b2a fix: update Batch schema 2020-04-07 17:33:10 +05:30
Rohan Bansal
ced78cf116 fix(stock): make requested changes 2020-04-07 17:33:10 +05:30
Rohan Bansal
92669eae66 fix(stock): batch list view statuses 2020-04-07 17:33:10 +05:30
Rohan Bansal
4a50c99867 fix(stock): Update batch quantity whenever stock in it is moved 2020-04-07 17:33:10 +05:30
Rohan Bansal
1bd7ea99f4 fix(batch): Only consider valid stock ledger entries 2020-04-07 17:33:10 +05:30
Rohan Bansal
40611080da fix(patch): Fix edge cases for Batch 2020-04-07 17:33:10 +05:30
Rohan Bansal
56827a372c fix(patch): Reload Batch doctype before update query 2020-04-07 17:33:10 +05:30