Saurabh
b36517158b
[fix] cheque print template coordinates ( #13959 )
2018-05-08 15:23:29 +05:30
Nabin Hait
161f35a687
Update sales_invoice.py
2018-05-05 14:32:31 +05:30
Rohit Waghchaure
3e0a937cb8
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-05-04 19:20:20 +05:30
Faris Ansari
5df63e36d4
Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix
2018-05-01 10:52:15 +05:30
Faris Ansari
bd99606a14
Change msgprint to unobtrusive alert
2018-05-01 10:52:02 +05:30
Zarrar
b0a46f397a
display customer's name while printing receivable report ( #13830 )
2018-04-30 19:40:18 +05:30
Faris Ansari
8be895091e
Set is_pos to 0 in Opening Invoice Tool ( #13810 )
2018-04-30 11:13:06 +05:30
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Rohit Waghchaure
31edddace6
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-04-24 11:43:31 +05:30
Nabin Hait
c36524ec54
Update chart_of_accounts.py
2018-04-20 11:00:20 +05:30
Saurabh
5b7503c074
Merge pull request #13691 from saurabh6790/supp_180417_1
...
[hotfix] multiple fixes
2018-04-19 15:57:35 +05:30
Zarrar
59f7b8c4a1
issue routing to report ( #13710 )
2018-04-18 02:56:02 -08:00
Saurabh
46ffbb74ff
fix cheque print measurements
2018-04-17 20:44:37 +05:30
Saurabh
f2a941b1a4
[fix] check if supplier value exists ( #13616 )
2018-04-15 21:37:14 -08:00
rohitwaghchaure
2ea593bdd8
[Fix] POS Profile data not set in the sales invoice ( #13568 )
2018-04-12 13:37:08 +05:30
rohitwaghchaure
aa7cddef5c
Merge pull request #13511 from rohitwaghchaure/table_styling
...
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:34:21 +05:30
Rohit Waghchaure
3d2b3d37d4
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:01:33 +05:30
Zarrar
e9ca5e81d2
hide add_child for root node ( #13444 )
2018-04-02 10:40:39 +05:30
Manas Solanki
0289ad285f
fix the route filters and payment account ( #13447 )
2018-04-02 10:13:22 +05:30
Rohit Waghchaure
ace68cd283
[Fix] Alignment and date issue in PDC report
2018-03-28 15:53:29 +05:30
Shreya Shah
c0201877dd
fixed column fieldnames for translations ( #13406 )
2018-03-27 18:45:42 +05:30
Shreya Shah
149f7ee875
[Fix] General Ledger Report ( #13374 )
...
* error fix if party_type = student or shareholder
* clear party filter when party_type changes to avoid error throw
* dict with values of party_name in utils.js
* fetch party_name from erpnext.utils.get_party_name
* Update general_ledger.py
2018-03-27 11:29:25 +05:30
Shreya Shah
9bcadf8126
Tax Id in some reports and print formats ( #13373 )
...
* tax-id in sales and purchase registers
* tax-id in general ledger print_format
* tax-id in accounts payable
* tax-id in accounts receivable
2018-03-23 15:04:37 +05:30
Nabin Hait
80a9f523d5
Minor fix AR/AP summary report
2018-03-23 13:02:27 +05:30
Siddhi Sawant
c672530210
[hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats ( #13316 )
...
* Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats
* Update gst_pos_invoice.json
Updated its 'disabled' property.
* Update pos_invoice.json
Updated its 'disabled' property.
* Shows change amount only if it exists
* Updated disable property of print formats
2018-03-20 14:31:14 +05:30
Nabin Hait
8a8966ce9b
minor fix
2018-03-20 11:19:57 +05:30
Saurabh
2777fd4332
[fix] validate minimum transaction amount in Payment Request for selected payment gateway ( #13328 )
2018-03-19 18:29:01 +05:30
Nabin Hait
70abac0061
Get territory from sales invoice
2018-03-15 12:19:16 +05:30
Nabin Hait
89346967da
Reverted #13259 ( #13291 )
2018-03-13 16:01:11 +05:30
Nabin Hait
97e890d0b3
Fix in unallocated amount calc in payment entry ( #13288 )
2018-03-13 15:57:34 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI ( #13290 )
2018-03-13 15:46:59 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting ( #13195 )
...
* [fix] #8427
* review comments changes
* Validation for reserved warhouse
* code improvements
* alignment
* test case
* message changes
* default warehouse / remove validation / change sql
* fix
* patch
* Fixed merge conflict
* Fixes and cleanups of reserve qty for subcontracting
* set from_warehouse only if purchase_order and purpose found (#12398 )
* [HotFix] Validation issue for subcontract stock entry (#12127 )
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
* Fixes and cleanups of reserve qty for subcontracting
* patch fixed
* Reload bin in patch
* [fix] set source warehouse in stock entry for manufacture
* [fix] #8540
* code alignment
* code alignment
* Move target warehouse validation to submit
* validation code improvement
* code changes for single stock entry
* validation fix
* call make_rm_stock_entry
* remove old stock entry method/rewrite test case
* Don't set bom_no against raw materials while trasferring items for sub-contracting
* minor fix
2018-03-12 14:12:12 +05:30
Shreya Shah
69d9f51dbb
if price list not found, set default selling/ buying price list from settings ( #13259 )
2018-03-12 11:15:49 +05:30
rohitwaghchaure
acd3479269
Bank POS transactions in bank reconciliation ( #13225 )
2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82
[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile ( #13233 )
2018-03-08 16:21:13 +05:30
tundebabzy
1643cce479
fetch journal entry details ( #13218 )
2018-03-08 11:17:17 +05:30
Saurabh
a65b28772f
[fix] setup_party_account_field on init
2018-03-06 18:22:01 +05:30
Nabin Hait
c10bbd6aa7
Editable unallocated amount in pe ( #13130 )
...
* editable unallocated amount in payment entry to handle multi currency
* set unallocated amount on server side
* some minor fixes
* Fixes in territory patch
* removed print
* minor fixes
2018-03-01 13:14:14 +05:30
Rohit Waghchaure
855d843e55
[Fix] Sales invoice email prompt not working
2018-03-01 13:06:01 +05:30
Ameya Shenoy
82048cf3ce
verify payment entry amount is positive ( #13066 )
...
* verify payment entry amount is positive
* Update sales_invoice.py
* Update sales_invoice.py
2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb
[Fix] Item wise sales register report ( #13055 )
2018-02-23 16:25:30 +05:30
rohitwaghchaure
dd0fc1084e
[Fix] PDC amount, PDC print layout issue ( #13062 )
2018-02-23 16:20:46 +05:30
Shreya Shah
8a77a0e1e4
Add total row in all trends reports ( #13010 )
...
* total in sales order trends report
* total in all trends reports
2018-02-21 14:46:07 +05:30
rohitwaghchaure
554f2de23d
Code cleanup online POS ( #12985 )
2018-02-20 11:18:01 +05:30
tundebabzy
6c5d7986ab
Outstanding Amount not getting updated in Payment Entry #12713 ( #12975 )
...
* allow to `set_missing_ref_details` by force
* update payment entry references during submit and cancel
2018-02-19 13:11:56 +05:30
Pawan Mehta
174a18399c
Added Payment Details to Sales Payment Summary Report ( #12358 )
...
* [fix] #12357
* label changes
2018-02-19 12:39:13 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ( #12940 )
...
* GSTR1 for B2B (#12296 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
* GSTR1 for B2B, B2CL and B2CS (#12459 )
* [Report] GSTR - 1 CDNR Report (#12554 )
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
* [wip] Gstr2
* [fix] Fetch correct Tax Details
* [minor] ITC data append to row
* [fix] CDNR negative value
* Cleanup and fixes on GSTR-2
* Minor fixes in gstr reports (#12848 )
* [new] B2C limit fetch from GST Settings (#12905 )
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
* Update utils.py
* Cusotm fields related GSTR2
* minor fixes
* minor fixes
* some more fixes
* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
Nabin Hait
cc98d40ff7
Payment reco auto allocation and maintain same order of records ( #12963 )
...
* Automatically allocate amount after selecting invoice against a payment entry
* codacy fixes
2018-02-16 13:14:20 +05:30
rohitwaghchaure
103c4e9b92
[Fix] Incorrect rate in item-wise sales register ( #12943 )
2018-02-16 12:57:35 +05:30
rohitwaghchaure
6e7e70c977
Added PDC from journal entry in AR report ( #12844 )
2018-02-12 11:55:07 +05:30
