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

24653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
4191d7eb52
Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice 
Fixed get_buying_amount in Gross Profit report:
 2018-11-26 19:55:06 +05:30
Nabin Hait
d0af0887be
Merge pull request #16051 from SaiFi0102/patch-1 
Remove "Test" Letter Head
 2018-11-26 19:47:07 +05:30
Nabin Hait
70642a0ae4
Merge pull request #16055 from rohitwaghchaure/fixed_holiday_list_not_working 
[Fix] New holiday list form is not working
 2018-11-26 19:44:19 +05:30
Nabin Hait
36f266355d
Merge branch 'staging-fixes' into fixed_holiday_list_not_working 2018-11-26 19:44:11 +05:30
Nabin Hait
736ce9a176
Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation 
Fixed error due to incorrect use of 'this' while calculating rate
 2018-11-26 19:31:25 +05:30
Saif Ur Rehman
147fa73d3f Fixed incorrect use of 'this' causing errors calculating rate 2018-11-26 18:14:06 +05:00
Rohit Waghchaure
d1a85a3637 [Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice 2018-11-26 18:42:29 +05:30
Rohit Waghchaure
15ed7a6351 [Fix] No permission for Manufacturing Settings 2018-11-26 17:31:18 +05:30
Anurag Mishra
e5248b6933 Merge branch 'new-fix-branch' of https://github.com/anurag810/erpnext into new-fix-branch 2018-11-26 17:25:28 +05:30
Anurag Mishra
5b6dd58b3e fixed ZeroDivisionError in sales_order.py 2018-11-26 17:22:50 +05:30
Nabin Hait
fc6194e640
Merge branch 'staging-fixes' into new-fix-branch 2018-11-26 17:16:06 +05:30
Nabin Hait
d5fc05c10b
Merge pull request #16090 from frappe/update-stale-bot-1-2 
Update stale.yml
 2018-11-26 17:15:19 +05:30
Nabin Hait
e8469daf0c
Merge branch 'staging-fixes' into update-stale-bot-1-2 2018-11-26 17:14:59 +05:30
deepeshgarg007
bd87903b56 Added condition for default amount 2018-11-26 17:13:59 +05:30
Anurag Mishra
e657fe84b8 making validation generic for sales order,sales invoice,purchase order etc. 2018-11-26 17:13:10 +05:30
Anurag mishra
6ddb15b3df fix(validate): Qty is mandatory in delivery note 2018-11-26 17:13:10 +05:30
Anurag mishra
7b2c445707 Delivery Note fixes 2018-11-26 17:13:10 +05:30
Nabin Hait
059c6f8da5
Merge pull request #16070 from nabinhait/travis-fix-1 
Travis fixes
 2018-11-26 17:00:10 +05:30
Nabin Hait
73ca3cfca6 fix(test): removed test print 2018-11-26 16:16:42 +05:30
Anurag Mishra
42d3af3bbb making validation generic for sales order,sales invoice,purchase order etc. 2018-11-26 15:19:17 +05:30
deepeshgarg007
533066eb87 Salary slip bug fix 2018-11-26 15:04:21 +05:30
Prateeksha Singh
758ca946fa
Update stale.yml 2018-11-26 14:45:54 +05:30
Rohit Waghchaure
3893ba302c If is pos and no pos profile use the item's default warehouse for packing materials 2018-11-26 14:13:24 +05:30
Anurag mishra
66bd5810c5 fix(validate): Qty is mandatory in delivery note 2018-11-26 11:36:57 +05:30
Anurag mishra
bc4574b59d Delivery Note fixes 2018-11-26 11:33:22 +05:30
Nabin Hait
2665c37f38 temp(travis): Print statement to fix travis 2018-11-26 11:05:28 +05:30
Nabin Hait
48e0e19b03 fix(test): Fixed salary slip and sales analytics test cases 2018-11-26 11:05:28 +05:30
Nabin Hait
2508d11097 fix(test): Test cases fixed 2018-11-26 11:05:28 +05:30
Nabin Hait
f77cd54a6c fix(tds): Create tds payable under correct parent 2018-11-26 11:05:28 +05:30
deepeshgarg007
9cdece4ca2 Test case fix and other minor bug fix 2018-11-26 11:05:28 +05:30
deepeshgarg007
5dbb9f5312 Accounts receivable summary print fix 2018-11-23 19:54:08 +05:30
deepeshgarg007
a1cffc3490 minor changes in dashboard 2018-11-23 16:51:35 +05:30
deepeshgarg007
0e8c36473a Added colspan to indicators 2018-11-23 11:22:24 +05:30
deepeshgarg007
920dc1400f Customer/Supplier dashboard fix for multi company setup 2018-11-23 10:17:28 +05:30
Rohit Waghchaure
037a151ef5 [Fix] New holiday list form is not working 2018-11-22 12:57:34 +05:30
Saif
2a2f2742eb
Remove "Test" Letter Head 2018-11-21 23:29:09 +05:00
Rohit Waghchaure
6424f47f3b [Fix] Incorrect stock value difference because of negative stock 2018-11-21 23:18:41 +05:30
Ranjith
1879e91148 fix: Trial Balance 2018-11-21 16:04:05 +05:30
Saif Ur Rehman
23eef11cf5 Fixed get_buying_amount in Gross Profit report: 
To handle the case where there may be multiple invoices for a single delivery
 2018-11-21 15:32:37 +05:00
Suraj Shetty
1eb098caf9 Add additional condition condition to get_pos_profile 
- If we have any POS Profile related to the user,
that profile should be used
 2018-11-21 14:36:58 +05:30
Rohan Bansal
f838597b5f fix(task): Fix error when trying to convert a task into a group even if no child tasks exist 2018-11-20 13:18:05 +05:30
Rohit Waghchaure
770a13ebc3 [Fix] Not able to view general ledger for purchase invoice 2018-11-20 13:01:52 +05:30
Ranjith
5d2e52c4ef fix: healthcare patch 2018-11-19 20:03:25 +05:30
Jamsheer
64e42e1e88 fix: Patient Appointment - update list view 2018-11-19 13:00:49 +05:30
Jamsheer
ee6b317ab5 fix: Patient Appointment - Code standards 2018-11-19 13:00:49 +05:30
Jamsheer
45695c9bcb fix: Realign Patient Appointment fields 2018-11-19 13:00:49 +05:30
Jamsheer
dc3ae114cd feat: Reschedule - Patient Appointment 2018-11-19 13:00:49 +05:30
Andrew McLeod
f99a68a695 feat: Added unit testing for Item Barcodes in item.py 
Adds three different barcodes and barcodes types to a test item and
checks that they are added correctly.
Adds a barcode that already exists, and checks a DuplicateEntryError
is raised.
Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of
ValidationError) is raised.
 2018-11-16 13:55:55 +00:00
Andrew McLeod
5607762c0f fix/feat: Allow extension of barcode types (without validation) 
Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py:
- There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces.
- All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated.
This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.
 2018-11-16 11:08:39 +00:00
Jsukrut
b9a95e29b7 [FIX][#15018][PATIENT Relation should be unique] 2018-11-16 11:30:12 +05:30