Commit Graph

2491 Commits

Author SHA1 Message Date
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
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
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
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
rohitwaghchaure
acd3479269 Bank POS transactions in bank reconciliation (#13225) 2018-03-08 16:22:39 +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
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
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
7477899d2e Formatter, code cleanup (#12852) 2018-02-12 11:25:58 +05:30
rohitwaghchaure
b553b7a69d PDC Enhancements (#12462) 2018-02-07 18:32:51 +05:30
Nabin Hait
33f967d97c Account name length fixed in HUngary and Germen COA 2018-02-07 16:00:42 +05:30
Jay Parikh
d4359faa31 Enable/Disable Discount in POS using POS Profile #11748 2018-02-01 04:26:24 -08:00
Nabin Hait
7918b92d95 Invalid date value comparison, fixes for mariadb 10.2.3+ 2018-01-31 15:30:03 +05:30
Nabin Hait
585254456e
Check credit limit while making DN, if bypassed on SO (#12702) 2018-01-30 12:11:22 +05:30
rohitwaghchaure
ce5b93ca77 [Fix] Allow user to edit rate in online POS (#12701) 2018-01-30 10:39:46 +05:30
Shreya Shah
406d449e12 fix posting date in journal entry on load (#12694) 2018-01-29 18:01:20 +05:30
rohitwaghchaure
86c7ede321
Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue
[Fix] Subscription send notification issue
2018-01-29 17:01:00 +05:30
Rohit Waghchaure
7e033aae11 [Fix] Subscription send notification issue 2018-01-29 16:53:37 +05:30
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685)
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date

* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
Saurabh
6cc10104f0 [fix] enable rename for payment terms and payment term template 2018-01-24 11:15:02 +05:30
Saurabh
3959aeb848 [fix] parse value before setting it to dissable_rounded_total on Purchase Invoice 2018-01-23 15:40:43 +05:30
Nabin Hait
91fd29a963
Remove enqueuing update_total_sales method, sometimes it does not include current invoice (#12522) 2018-01-17 16:14:31 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale (#12514)
* GL Entry on asset sale

* Asset sale test case fixed
2018-01-17 14:39:05 +05:30
rohitwaghchaure
9fbed5617f [Fix] Wrong batch showing in the popup (#12421) 2018-01-12 16:22:33 +05:30
Zarrar
0f458b1260 show balance if permitted to view gl entry (#12385) 2018-01-09 11:27:14 +05:30
tundebabzy
da22167741 Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382)
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.

* ui test cases

* cleanup
2018-01-09 10:58:44 +05:30
rohitwaghchaure
bf4c114c58 [Enhance] Provision to show inclusive tax in print (#12345)
* [Enhance] Provision to show inclusive tax in print

* POS Print format
2018-01-08 15:20:15 +05:30
Zlash65
745c2658eb delete root node allow 2018-01-08 11:53:52 +05:30
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290)
* Companywise default tax template

* Fix test cases
2018-01-05 12:42:02 +05:30
Nabin Hait
42688f0636 Minor fix 2018-01-04 18:12:21 +05:30
Nabin Hait
76625b359e Removed naming series from set_only_once in pos profile 2018-01-03 14:03:53 +05:30
Nabin Hait
96b264b314 Minor fixes 2018-01-02 11:50:29 +05:30