Commit Graph

966 Commits

Author SHA1 Message Date
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report (#17524)
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Mangesh-Khairnar
57c861efc3 feat: add patch to create custom fields for india specific client 2019-05-20 13:08:18 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips (#17380)
* feat: Added check for encrypting salary slips and password policy field

* feat: make password policy mandatory if encrypt option is selected

* feat: added password logic to email_salary_slip

* fix: import error

* chore: Minor enhancement to validations in salary slip

* fix: travis patch

* feat: Modified email body for password protected salary slips
2019-05-08 17:30:08 +05:30
Mangesh-Khairnar
9215de02c5 feat: add india specific custom fields in company 2019-05-06 16:24:10 +05:30
Himanshu
ac1ce5d205 fix: Remove Scheduling Tool if exists (#17473)
* fix: scheduling tool

* fix: patch for scheduling tool

* fix: remve drop table
2019-05-04 22:43:37 +05:30
deepeshgarg007
3c1b9aa77b fix: Remove patch 2019-05-03 09:47:38 +05:30
deepeshgarg007
6c6b24011f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop 2019-05-02 23:03:59 +05:30
deepeshgarg007
9ae112bbfc fix: Inactive items report fix 2019-05-02 19:38:15 +05:30
Nabin Hait
89b06132cd minor fix 2019-05-01 14:20:08 +05:30
Nabin Hait
a08bf7ef86 fix: a few fixes in payroll 2019-05-01 12:17:47 +05:30
Nabin Hait
d3cd98c45e fix: Renamed depends_on_lwp to depends_on_payment_days 2019-04-22 13:45:45 +05:30
Anurag Mishra
35e52b5596 fix: fixed spelling 2019-04-22 13:37:03 +05:30
karthikeyan5
307e6a8825 fix(woocommerce integration): defaults in settings
(cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)
2019-04-15 19:47:02 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Nabin Hait
a3357e4e86 fix: Default variant Based on 2019-04-05 12:10:36 +05:30
Nabin Hait
f4af608408 fix: Fetch HSN code only if empty 2019-04-01 11:51:54 +05:30
deepeshgarg007
4f1926bcfe fix: Add patch to move item tax to item tax template 2019-03-29 12:10:44 +05:30
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
1f2f9cf360 feat: added stock entry type master to select purpose in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
4ae221946b renamed report 2019-03-26 11:14:06 +05:30
Rohit Waghchaure
1c1d0bb1c7 feat: commonified item group wise target variance report 2019-03-25 17:56:43 +05:30
Rohit Waghchaure
4792a84b5f fix: rename pricing rule child doctype names 2019-03-25 14:28:08 +05:30
Rushabh Mehta
2537b7fce8
Merge branch 'develop' into hotfix-work-order-item-name 2019-03-22 12:48:56 +05:30
Deepesh Garg
22b61607c6 feat: GSTR3B Report JSON creation and Print Format (#16595)
* feat: Created doctype for GSTR3B report and added boilerplate code

* feat: Updated gst_fields and patches for gst_category

* feat: Functions for calculating itc amount

* fix: Patched eligibility_for_itc_field

* fix: Updated set_category for gst

* fix: Function for setting iter_state supplies

* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format

* fix(style): Added missing semicolon and removed unused imports

* fix: Patch field only if column is available

* fix: Make custom fields only for india sepecific company

* fix: Add intro to gstr3b report

* fix: Updated patch in patches.txt

* fix: Update patches.txt

* fix: Update patch to set GST Category

* fix: Add fields for nil rated and non gst in item master

* fix: Added logic for nil rated and non gst inward flow

* fix: Initial test case for GSTR3B Report

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Add link for gstr_3b_report in accounting module

* fix: Updated report template

* fix: Changes in GSTR3B Report doctype

* fix: Added function to get missing field invoices

* fix: Added more test cases

* fix: Item not found error in test case

* fix: Key error in state numbers

* fix: Changes in GSTR3b Doctype

* fix: Changed functions to method

* fix: Minor fix in patch

* fix: Add gst_ctegory in GST Reports

* fix: Minor fixes in patch and itc_mapping

* fix: Query to patch itc field

* fix: Patch registered customers and fix for multiple gst accounts

* fix: Test case

* fix: Total taxable calculation logic fix and template enhancement

* fix: Calculate txval seperately

* fix: itc amount calculation fix and patch improvement

* fix: Updated test_cases for itc calculation

* fix: Missing field query

* fix: Multiple minor fixes inreport

* fix: Added transalations in GSTR3B-Form

* fix: Use double underscore for translation

* fix: GST fields ordering fix

* fix: Print form precision fix and get_period function fix
2019-03-21 20:47:47 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965)
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Rohan Bansal
6cbd3998fb fix(work_order): Use single update query 2019-03-12 12:15:37 +05:30
Rohan Bansal
b4745ec668 fix(work_order): Change Work Order title to show item name instead of item code 2019-03-12 12:13:02 +05:30
Rohit Waghchaure
52729bf369 feat: child table to add multiple time logs in job card 2019-03-11 00:02:32 +05:30
Frappe Bot
8f0660ab31 Merge branch 'master' into develop 2019-03-01 09:22:36 +00:00
Gaurav
b30a9b1869 fix(regional,italy): bank details, custom button on sales invoice
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
2019-03-01 12:38:35 +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
Rushabh Mehta
02a9ec33ed BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk 2019-02-26 14:30:38 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +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
Suraj Shetty
1399fbe986 Move patch 2019-02-16 21:02:34 +05:30
Suraj Shetty
8cbe824c5b Rerun item_barcode_chidtable_migrate patch 2019-02-16 17:54:15 +05:30
Faris Ansari
8a01342e48
fix: Remove comment 2019-02-15 15:14:38 +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
Zlash65
a206f06af9 delete notification control's docctype entry 2019-02-11 12:01:01 +05:30
Prateeksha Singh
ce27cffaad refactor(desk_icon): Remove reference and patches to Desktop Icon 2019-02-07 09:58:21 +05:30
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
Saurabh
5c12490709 fix: patch to add guardian role if not exists 2019-01-30 11:52:53 +05:30