Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Nabin Hait
21706894af
Merge pull request #16705 from deepeshgarg007/pos-precision
...
fix: Fetch precision form system settings in Sales invoice payment(POS)
2019-02-19 15:06:56 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix
2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978
Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule
...
fix: multi-uom not working for the pricing rule rate
2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix
...
fix: Removed precision from multiple doctypes
2019-02-19 15:03:00 +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
deepeshgarg007
de0f59b818
fix: Removed precision from multiple doctypes
2019-02-19 08:40:16 +05:30
Rohit Waghchaure
5821b672ad
fix: multi-uom not working for the pricing rule rate
2019-02-18 20:07:44 +05:30
deepeshgarg007
9a19e06856
fix: Change Received qty to accepted qty and validation for indicators
2019-02-18 18:42:15 +05:30
deepeshgarg007
48a7262fae
fix: Precision issue in POS payment
2019-02-18 15:05:36 +05:30
Sagar Vora
551f52fd25
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
Nabin Hait
e3b0f4f9f6
fix: removed account type filter on employee advance account
2019-02-08 16:56:26 +05:30
Aditya Hase
46d7456782
fix(py3): Convert list to filter for indexing
2019-02-08 12:02:14 +05:30
Aditya Hase
3e954734d0
fix(py3): Convert filter to list for indexing
2019-02-07 22:21:05 +05:30
Aditya Hase
0b1dc32fcb
Merge pull request #16597 from adityahase/python3-fix
...
fix(py3): Use range instead of xrange
2019-02-07 18:17:37 +05:30
Aditya Hase
b9dc031e86
fix(py3): Use range instead of xrange
2019-02-07 18:10:30 +05:30
Prateeksha Singh
ce27cffaad
refactor(desk_icon): Remove reference and patches to Desktop Icon
2019-02-07 09:58:21 +05:30
Sagar Vora
da1dc7fa52
Merge branch 'master' into develop
2019-02-05 18:40:39 +05:30
Chinmay Pai
125505f2aa
fix(purchase_invoice): fix undefined variable
...
fixes issue while creating purchase invoice
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-04 16:30:20 +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
Sagar Vora
56cbfe4bb0
Merge branch 'master' into develop
2019-01-31 13:34:32 +05:30
Aditya Hase
66833f109b
fix(accounts): fetch subscription details only if required fields are populated
2019-01-30 19:40:40 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Sagar Vora
f3cfad7595
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
rohitwaghchaure
a95ed44d3d
fix: test case for fiscal year ( #16516 )
2019-01-29 16:24:53 +05:30
Sagar Vora
8f6509fa9a
Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months
2019-01-29 13:04:20 +05:30
Sagar Vora
9520e345bd
fix: better error messages
2019-01-29 13:03:46 +05:30
Rohit Waghchaure
a8e743e3c4
fix: fiscal year always be for 12 months
2019-01-29 12:55:04 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue
2019-01-29 11:29:41 +05:30
Nabin Hait
ff2922cbbb
Merge pull request #16488 from deepeshgarg007/price_list
...
fix(sales_invoice): fetch customer price list if available before pos price list
2019-01-29 11:24:22 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
deepeshgarg007
4e4b200972
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue
2019-01-27 22:54:34 +05:30
deepeshgarg007
c2ffcc5e71
feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher
2019-01-27 16:09:07 +05:30
deepeshgarg007
76556e1a3e
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list
2019-01-25 16:50:06 +05:30
Nabin Hait
e21bdf020c
Merge pull request #16472 from deepeshgarg007/cost_center
...
fix(cost_center): Bug fix in update_cost_center_number argument name
2019-01-25 09:56:52 +05:30
Nabin Hait
393080ecbe
Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working
...
fix: ascii codec while opening offline POS
2019-01-25 09:50:41 +05:30
Rohit Waghchaure
e14cc8f2b6
fix: bank reconcilliation showing multiple entries against one JV
2019-01-25 00:23:41 +05:30
Saif Ur Rehman
3d275af67b
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
2019-01-24 23:40:16 +05:00
Rohit Waghchaure
74df01d3d1
fix: ascii code while opening offline POS
2019-01-25 00:03:35 +05:30
deepeshgarg007
c48efaba6e
fix(sales_invoice): fetch customer price list if available before pos profile price list
2019-01-24 17:15:38 +05:30
deepeshgarg007
19ab86a3a7
fix:(cost_center): fix for update cost center number
2019-01-23 17:28:13 +05:30
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Nabin Hait
141c543f97
Update journal_entry.js
2019-01-23 12:14:55 +05:30
Nabin Hait
36706c04bb
Merge pull request #16451 from nabinhait/unicode-issue
...
fix: Unicode issue in purchase invoice
2019-01-23 12:11:00 +05:30
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports
...
fix: Multiple fixes in the reports
2019-01-23 12:05:36 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Nabin Hait
a5270e561f
fix: Unicode issue in purchase invoice
2019-01-22 15:43:04 +05:30
Rohit Waghchaure
ddd9136d10
Renamed field and added finance book column in the trial balance simple report
2019-01-22 14:11:57 +05:30
