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

185 Commits

Author SHA1 Message Date
Rushabh Mehta
7bb9eae685
Merge pull request #16541 from alyf-de/develop 
feat(regional): Germany module with address template
 2019-02-16 10:54:28 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Nabin Hait
afef9c1cc7 fix: Ignore tds account while creating tax withholding category 2019-02-12 11:28:20 +05:30
Raffael Meyer
ff878c0c1d fix formatting and names 2019-02-07 03:28:27 +01:00
Raffael Meyer
fef07eeae2 Merge remote-tracking branch 'upstream/develop' into develop 2019-01-31 22:16:26 +01:00
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
1467962f8a
Merge pull request #16490 from nabinhait/gst_settings_perm 
GST Settings permission and regional taxes creation
 2019-01-29 11:27:18 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
Raffael Meyer
1f72b44f12 add german module with address template 2019-01-27 23:32:41 +01:00
Nabin Hait
42462fac9d
Merge pull request #16465 from nabinhait/eway_bill 
fix(accounts): Validate gst accounts defined in GST Settings in eway bill report
 2019-01-25 10:00:06 +05:30
Nabin Hait
f1ff5c24ff
Merge pull request #16469 from sagarvora/minor-gstin 
fix(regional): remove duplicate validation for GSTIN
 2019-01-25 09:59:45 +05:30
Nabin Hait
49b41e49ae fix: Added permissions in GST Settings and added filters for accounts based on company 2019-01-24 17:55:44 +05:30
Sagar Vora
d75095b04c fix(regional): remove duplicate validation for GSTIN 2019-01-23 14:40:01 +05:30
Frappe Bot
e415cce1a9 Merge branch 'staging' into develop 2019-01-23 08:19:00 +00:00
Frappe Bot
34121bc81a Merge branch 'master' into staging-fixes 2019-01-23 08:08:55 +00:00
Nabin Hait
8c2a2c8f60 fix(accounts): Validate gst accounts defined in GST Settings in eway bill report 2019-01-23 10:33:47 +05:30
FinByz Tech Pvt. Ltd
237a871f17 fix: NoneType object has no attribute "gstin" (#16458) 
* fix: NoneType object has no attribute "gstin"

* fix: handle NoneType values
 2019-01-22 20:49:06 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Nabin Hait
a334ed879f
Update __init__.py 2019-01-22 10:41:50 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address 2019-01-16 17:51:49 +05:30
Nabin Hait
3dd5f55412 feat(stock-reco): Fetch items in stock reco based on group warehouse 2019-01-16 16:20:05 +05:30
Nabin Hait
158e7dcd8b fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM 2019-01-16 16:00:25 +05:30
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address 2019-01-16 11:17:55 +05:30
Saurabh
7d630b3e29 Merge branch 'master' into staging-fixes 2019-01-15 19:41:09 +05:30
Sagar Vora
f99e013ebc
fix: gstin validation should work when there is no state (#16378) 2019-01-10 11:57:24 +05:30
Sagar Vora
07cf4e8f5b fix: use division consistent with Python 3 & other changes 2019-01-10 11:14:58 +05:30
karthikeyan5
2825b929c1 fix(GSTIN Validation - india): added checksum validation for GSTIN 2019-01-09 19:15:10 +05:30
deepeshgarg007
d29ee97307 Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt 2019-01-09 17:09:11 +05:30
Sagar Vora
d40743a570
fix: 14th digit may not be zero 2019-01-07 13:38:43 +05:30
Himanshu
75ab042632
removed lowercase regex 2019-01-04 17:13:43 +05:30
Himanshu
547229fef1
PAN card validation in GST 2019-01-03 23:20:38 +05:30
Himanshu
53c040f838
Gst number validation fix 2019-01-03 12:50:18 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Charles-Henri Decultot
9100740ba9 [Fix] FEC: Correction of the export function (#16252) 
* Correction of the export function

* Improve JS code

* Codacy corrections

* Codacy corrections
 2018-12-24 14:20:35 +05:30
Saurabh
e165fc0e1b Merge branch 'staging' into develop 2018-12-13 10:45:32 +05:30
Prateeksha Singh
dabf349599 [setup] don't premake company fixtures 2018-12-12 21:29:54 +05:30
Prateeksha Singh
39b8765961 [setup][init] setup as document records 2018-12-12 21:29:54 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Nabin Hait
f77cd54a6c fix(tds): Create tds payable under correct parent 2018-11-26 11:05:28 +05:30
Frappe Bot
98a2348779 Merge branch 'staging' into develop 2018-11-14 11:33:08 +00:00
Nabin Hait
d34bfa8c2c fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes 2018-11-13 18:21:22 +05:30
Himanshu Mishra
35b2627112 Item qty based tax (CESS) calculation support (#15456) 
* fix conflicts

* added test case for qty cess

* use company specified in document to get region
 2018-11-13 11:13:04 +05:30
Ameya Shenoy
606c504f28
Merge branch 'staging' into develop 2018-10-15 12:25:03 +00:00
Charles-Henri Decultot
6c743bebf2 Check for prefix before return EcritureNum (#15629) 2018-10-11 16:51:29 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop 2018-10-11 06:58:53 +00:00
rohitwaghchaure
b1241caf48
Merge pull request #15650 from rohitwaghchaure/fix_gst_state_issue 
[Fix] Nontype object has no attribute gst_state
 2018-10-11 10:53:46 +05:30
Rohit Waghchaure
b6a735e021 [Fix] Nontype object has no attribute gst_state 2018-10-11 10:40:34 +05:30
Sagar Vora
d92f3ac480 Fix 'transporter info' section in Delivery Note (#15565) 
- create is_transporter checkbox in supplier doctype
- new field transporter (supplier with is_transporter checked)
- created fields driver and driver_name
- removed GST India fields from core doctype
- removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery)
- read_only transporter_name field (kept for backwards compatibility)
- made necessary changes in delivery_trip implementation
- hidden section's fields from print (preserving v10 convention)
- added transporter field to 'Driver' doctype
- added queries for transporter and driver fields
- GST India fields in regional module
- Fix e-waybill report
 2018-10-10 14:51:26 +05:30