Nabin Hait
0abfcb5516
Merge pull request #16442 from rohitwaghchaure/pos_query_code_cleanup
...
fix: Code cleanup
2019-01-22 09:56:57 +05:30
Rohit Waghchaure
de718dacb2
fix: Code cleanup
2019-01-21 19:47:17 +05:30
scmmishra
f2d0be7299
[feat] Modified help config
2019-01-21 19:35:46 +05:30
scmmishra
dd461636e3
[feat] Updated all help_links
2019-01-21 19:35:02 +05:30
Rohit Waghchaure
11ce45077d
[Fix] Not able to submit work order
2019-01-21 19:18:52 +05:30
Nabin Hait
a39f324682
fix: Disable rounded total field's value honours docfield's default value
2019-01-21 18:50:50 +05:30
deepeshgarg007
3565395e7a
Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest
2019-01-21 15:03:51 +05:30
deepeshgarg007
aab6d0e028
fix(email_digest): Linkes annual income and annual expense to profit and loss statement
2019-01-21 15:01:40 +05:30
deepeshgarg007
ff1078f271
fix(minor): fetch payment terms if voucher nos are available
2019-01-21 09:43:56 +05:30
Tyler Matteson
7928a685c8
Feat: US Regional module, added test, changed address template reference to convention
2019-01-20 09:55:44 -05:00
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest
2019-01-20 16:53:41 +05:30
Tyler Matteson
fdb8e4d427
Merge branch 'usregional' of https://github.com/agritheory/erpnext into usregional
2019-01-19 14:26:41 -05:00
Saif Ur Rehman
31d58eac01
fix(Party Ledger Summary): Added Supplier/Customer Name column
2019-01-19 15:28:53 +05:00
Saif Ur Rehman
55566b7f8e
fix(Party Ledger Summary): Codacy fix
2019-01-19 15:12:08 +05:00
Himanshu
79d4400c16
fix: Offline pos fix ( #16424 )
...
* Offline POS fix
* Fixed items search and load items
2019-01-19 14:01:38 +05:30
Saif Ur Rehman
fcaed12a53
Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary
2019-01-19 13:18:23 +05:00
Aditya Hase
442c85c006
fix(marketplace): Capitalize marketplace factory class to support router changes ( #16428 )
2019-01-18 21:28:37 +05:30
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Faris Ansari
f523611e12
Merge branch 'hotfix' into leave-application-naming
2019-01-18 14:30:39 +05:30
Rohit Waghchaure
7e71e132a3
Added patch
2019-01-18 11:47:31 +05:30
deepeshgarg007
3c9dd73f91
Added company filters for reports
2019-01-18 11:29:37 +05:30
Nabin Hait
0c44701901
Merge pull request #16375 from deepeshgarg007/company_address
...
feat: Company address and GST field addition in sales order, purchase order, purchase receipt
2019-01-18 10:57:57 +05:30
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series
...
feat(naming): Deferred naming for SLE and GL Entry
2019-01-18 10:55:30 +05:30
Nabin Hait
7bea25a23a
Merge pull request #16415 from ks093/ks093-shopping-cart-fixes
...
fix: Show stock validation message while placing order and Quotation series field fix in shopping cart settings.
2019-01-18 10:46:24 +05:30
Nabin Hait
6cc2a36c79
Merge pull request #16418 from nabinhait/stock_transfer_inter_company
...
Fix: Inter company stock transfer for serialised items
2019-01-18 10:45:07 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Nabin Hait
6202d0ed68
fix: NoneType comparison with int error
2019-01-18 09:40:24 +05:30
Nabin Hait
30667c160d
test: Inter company stock transfer for serialised items
2019-01-18 09:36:18 +05:30
Nabin Hait
5a87ac0ad8
fix: Inter company stock transfer for serialised items
2019-01-18 09:36:18 +05:30
Tyler Matteson
53a6492f29
FEAT: US Regional Module with IRS 1099 reporting
2019-01-17 14:04:51 -05:00
Rohit Waghchaure
425dff93d7
fix: Project update status code and design refactored
2019-01-17 19:21:44 +05:30
deepeshgarg007
00f989a916
fix(email_digest): fix in account heads
2019-01-17 17:59:52 +05:30
Rohit Waghchaure
fa7ee0b3b6
Added dafult bank account in the customer/supplier
2019-01-17 15:45:27 +05:30
Rohit Waghchaure
f725816809
Enhance: Added field limit in the Payment Reconciliation to handle large entries
2019-01-17 12:54:14 +05:30
deepeshgarg007
753c5d7514
fix(Codacy): Possible Sql injections
2019-01-17 12:28:56 +05:30
ks093
61c781325d
Fix to show low stock message.
...
In case of order being placed with stock quantity more than available, message showing stock available wasn't showing due to tuple unpacking not happening correctly.
2019-01-17 12:16:43 +05:30
ks093
1ed819bb10
Refresh quotation_series field to show series
2019-01-17 12:09:04 +05:30
Nabin Hait
c338188ce2
Merge pull request #16409 from SaiFi0102/Gross-Profit-Return-Fix
...
fix(Gross Profit Report): corrected fieldnames in return invoice query
2019-01-17 10:56:04 +05:30
Deepesh Garg
bce62a4bcc
Delete __init__.py
2019-01-16 22:57:45 +05:30
Deepesh Garg
70657d06f4
Delete pending_sales_order.json
2019-01-16 22:57:20 +05:30
Deepesh Garg
b8e0bfc335
Delete pending_quotation.json
2019-01-16 22:56:30 +05:30
Deepesh Garg
9cf9cb0e00
Delete __init__.py
2019-01-16 22:55:48 +05:30
Deepesh Garg
9da018d59c
Delete quotation.json
2019-01-16 22:55:10 +05:30
Deepesh Garg
59b9d363c9
Delete purchase_order.json
2019-01-16 22:54:45 +05:30
Deepesh Garg
23b7f0def4
Delete __init__.py
2019-01-16 22:54:17 +05:30
Deepesh Garg
e95a4053cf
Delete sales_order.json
2019-01-16 22:53:53 +05:30
Deepesh Garg
e6e1f2a46f
Delete __init__.py
2019-01-16 22:53:28 +05:30
Deepesh Garg
e4303111b4
Delete __init__.py
2019-01-16 22:53:00 +05:30
Deepesh Garg
9fb871c040
Delete pending_purchase_order.json
2019-01-16 22:52:27 +05:30
Deepesh Garg
3f5fea97fa
Delete __init__.py
2019-01-16 22:52:07 +05:30
