Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Rohit Waghchaure
1b7059b867
fix: ImponibileImporto calculation
2019-03-27 15:33:47 +05:30
Rohit Waghchaure
22ebaf1b11
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-26 20:19:46 +05:30
Rohit Waghchaure
5816fc2801
Renamed subcontract to Send to Subcontractor
2019-03-26 12:52:49 +05:30
Rushabh Mehta
f060831cce
fix(escaping): make_italian_localization_fields.py
2019-03-18 18:04:34 +05:30
Frappe Bot
1fcae10258
Merge branch 'master' into develop
2019-02-28 10:20:48 +00:00
Rohit Waghchaure
74cfe57716
fix: e-invoicing patch, patch to set country code in the address
2019-02-27 14:38:36 +05:30
Saurabh
482ebd2c7c
Merge branch 'master' into develop
2019-02-20 18:14:18 +05:30
Saurabh
9fcfc63f77
fix: reload report doc and indentation fixes
2019-02-20 17:04:18 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Gaurav
3f046136d4
fix(regional,italy): added state code on address, updated patch
...
moved state codes to init, rewired patch
added logic to autoset state code on address validate
handled multiple names for Italy
refactored validate_address_italy to validate_address
2019-02-19 17:28:36 +05:30
Nabin Hait
8e9d947527
Merge branch 'hotfix' into fix-item-variant-settings-barcodes
2019-02-19 15:07:46 +05:30
Gaurav
f1e28e0e8d
mod(regional,italy): Updates to Italian Localization
...
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
2019-02-19 10:39:22 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
Nabin Hait
a0c9c7501b
Update update_total_qty_field.py
2019-02-15 14:24:08 +05:30
Nabin Hait
6f7a4d94ce
fix: Consider parenttype while updating total qty in transactions
2019-02-14 19:34:43 +05:30
Faris Ansari
a748ca69e7
fix: Validate invalid fields in Item Variant Settings
...
- Some fields like barcodes cannot be copied in Item Variants
- Wrote a patch that deletes the fields if they exist
- Also, validate in controller
2019-02-13 13:02:39 +05:30
Sagar Vora
551f52fd25
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
sahil28297
1a7e438fb2
fix(pstch): allow duplicate entries ( #16632 )
2019-02-11 15:53:04 +05:30
Prateeksha Singh
ce27cffaad
refactor(desk_icon): Remove reference and patches to Desktop Icon
2019-02-07 09:58:21 +05:30
Nabin Hait
e1c75a9d55
fix: fixed salary structure assignment patch ( #16546 )
...
* fix: fixed salary structure assignment patch
* fix: patch
2019-02-01 12:25:40 +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
49b41e49ae
fix: Added permissions in GST Settings and added filters for accounts based on company
2019-01-24 17:55:44 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Rohit Waghchaure
7e71e132a3
Added patch
2019-01-18 11:47:31 +05:30
Saurabh
68ea608ca8
fix: import unicode_literals
2019-01-15 14:47:32 +05:30
Suraj Shetty
c349ae26b9
Add patch to rename additional salary component
...
- Should fix https://pastebin.com/xsNHPAh6
(happens when clicking links option in menu of Employee master)
2019-01-02 09:31:11 +05:30
rohitwaghchaure
56c5d8b784
Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields
...
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:26:19 +05:30
Rohit Waghchaure
8406720a7a
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:25:44 +05:30
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
...
Fix user permission checks
2018-12-26 14:49:01 +05:30
Suraj Shetty
488aa86f70
Skip some codacy warnings
2018-12-25 14:46:44 +05:30
rohitwaghchaure
4265c5a772
Rename BOM and Work order fields ( #16209 )
...
* Rename BOM and Work order fields
* Rearranged BOM fields
2018-12-24 14:38:49 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes
2018-12-18 15:41:03 +05:30
Rohan
c1eb94d37f
Revert "fix(delivery): update package total on validate ( #16131 )"
...
This reverts commit f43433b43d
.
2018-12-10 20:27:14 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Rohan
f43433b43d
fix(delivery): update package total on validate ( #16131 )
2018-12-10 17:47:31 +05:30
Ranjith
5d2e52c4ef
fix: healthcare patch
2018-11-19 20:03:25 +05:30
Nabin Hait
a0a2f58a21
Merge pull request #15985 from adityahase/perf-patch
...
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
2018-11-15 14:50:58 +05:30
Rohit Waghchaure
43920530a1
[Minor] Patch fixes
2018-11-15 12:20:27 +05:30
Aditya Hase
d168a71cfb
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
...
update_total_qty_field patch was using UPDATE statement with CASE
Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
2018-11-14 19:09:07 +05:30
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
Alchez
ce3340903d
Update Delivery Trip status based on visited stops ( #15723 )
...
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops
* feat(delivery_trip_status): Fix tests
* feat(delivery_trip_status): Fix allow on submit for status
* feat(delivery_trip_status): Change status mapping
* feat(delivery_trip_status): Fix patch
* Update update_delivery_trip_status.py
2018-11-13 12:22:17 +05:30
Rohit Waghchaure
56bf39bfea
[Fix] Patch
2018-11-06 16:32:29 +05:30
deepeshgarg007
0cbb9b54fa
Deprecating subscriber doctype ( #15695 )
...
* Depricating subscriber doctype
* Removed naming series
2018-10-16 14:39:16 +05:30
Ameya Shenoy
102eb998ac
fix(patch): reload healthacre doctypes
...
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-15 17:40:02 +05:30
Jamsheer
2a966f26af
fix: patch - change healthcare desktop icons ( #15683 )
2018-10-15 14:54:29 +05:30
Shreya Shah
e9890a3ec8
fix(patch): Check if meta object has naming_series field ( #15651 )
2018-10-11 16:28:59 +05:30
Faris Ansari
4833b4c274
fix: Default Series in naming series patch ( #15656 )
2018-10-11 16:27:05 +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
Shreya Shah
dd87e0f1e2
fix(leave-type): Drop column max_days_allowed ( #15642 )
2018-10-10 14:48:49 +05:30