Vishal Dhayagude
d377018695
[fix] Shipping charges change on qty, item_code and conversion_factor trigger ( #12001 )
...
* [wip] shipping rule
* [wip] Shipping Rule tax auto calculate
* [wip] Shipping Rule
* [new] Shipping charges change on different triggers
* [minor] Removed unnecessary comments
* [fix] Minor Changes in function calls
2017-12-14 18:06:02 +05:30
Nabin Hait
0f97eda7c9
Merge branch 'master' into develop
2017-12-12 19:17:53 +05:30
Nabin Hait
af9bdfeaa3
Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation ( #11965 )
2017-12-12 18:50:05 +05:30
rohitwaghchaure
47749f4635
[fix] Cur_frm breaking offline pos ( #11955 )
2017-12-12 14:16:03 +05:30
Vishal Dhayagude
d42242df22
[Feature] Shipping Rule Calculation based on Net Weight ( #11770 )
...
* [new] Calculate shipping tax based on weight
* [fix] Change field name weight to weight_per_unit in SI Item
* [new] Shipping Rule based tax for selling module
* [new] Shipping rule based on weight added to Buying module
* [fix] Conflict in jsons
* [fix] Removed Redudant add_fetch
* [fix] Codacy fixed
* [fix] Print hide added
2017-11-29 16:09:59 +05:30
Nabin Hait
02ac901345
[fix] Rounding adjustment in company currency
2017-11-22 16:12:20 +05:30
Nabin Hait
877e1bb377
Post GL Entry based on rounded total in Sales/Purchase Invoice ( #11542 )
2017-11-17 12:27:43 +05:30
Shreya Shah
be690ef817
Rate with margin in customer and company currency ( #11437 )
...
* field for company margin
* added base_rate_with_margin
* calculate company margin
* test for item price
* test for delivery note
* test for sales order
* test for quotation
* test for sales invoice
2017-11-14 17:22:41 +05:30
rohitwaghchaure
45d45f4247
[hotfix] Wrong calculation of total in taxes and totals ( #10924 )
2017-09-27 11:49:13 +05:30
Nabin Hait
39c2f75e6d
Merge branch 'master' into staging
2017-09-25 16:03:32 +05:30
Nabin Hait
3d5d858933
set total in tax table if category not valuation and consider deductions ( #10870 )
2017-09-21 16:15:30 +05:30
Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
tundebabzy
258faab761
Transaction Forms (Payment Entry, Sales Invoice, Purchase Invoice) can forget company currency ( #10409 ) ( #10410 )
...
* properly keep track of document currency and company currency
* Update taxes_and_totals.js
2017-08-16 13:16:46 +05:30
Nabin Hait
564e8b74dc
Minor fixing in setting cumulative tax amount
2017-08-01 16:35:22 +05:30
Nabin Hait
4ada637b17
Update taxes_and_totals.js
2017-08-01 16:20:59 +05:30
Kanchan Chauhan
d0c5b3eb07
[URGENT] this is me
2017-08-01 16:02:01 +05:30
Nabin Hait
cd95134267
Rounding issue in tax calculation ( #10135 )
...
* Adjust rounding loss of discount in the last item row. Fixes #8952
* Fixed rounding issue in tax calculation. Fixes #8953 , #8952 , #8893 , #6954 , #8910
* Rounding related fixes for purchase cycle
2017-07-31 18:07:45 +05:30
Rohit Waghchaure
5296e3c321
[enhance] Provision to set default mode of payment for the POS in POS profile
2017-07-27 19:17:05 +05:30
Rohit Waghchaure
baa937aa52
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
2017-07-25 15:26:01 +05:30
Nabin Hait
b962fc1573
Show hsn code in tax breakup for India and render via template ( #9866 )
...
* Show hsn code in tax breakup for India and render via template
* tax breakup if gst_tax_field does not exists
* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
Nabin Hait
0a32b7a6eb
Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code
2017-07-12 19:21:05 +05:30
Rohit Waghchaure
296fbfeaac
[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice
2017-07-10 23:06:49 +05:30
Nabin Hait
fbb5945ff3
Fixed itemised tax calc to fix pos loading
2017-07-07 12:58:22 +05:30
Nabin Hait
f3f0dfef2a
Invoice copy, state code in gst print format, hsn code in other sales/purchase docs ( #9658 )
...
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs
* Formatted Net Amount in item-tax-breakup
* GST print format fixes
* removed trailing whitespace
* removed trailing whitespace
2017-07-06 14:49:34 +05:30
Nabin Hait
852cb64e4f
GST tax invoice print format and more ( #9616 )
...
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608
* Reload gst print format only for Indian users
* Fixes as Codacy
2017-07-05 12:58:19 +05:30
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
rohitwaghchaure
d2be55b2e0
[Fix] Orders not creating from the POS for new customer if customer name is based on naming series ( #8933 )
...
* [Fix] Orders not creating from the POS for new customer if customer name is based on naming series
* [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile
* added customer name in the search bar of the customer
* search customer by phone number and email id in the POS
2017-06-07 12:04:01 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Nabin Hait
9f5f534900
set item rate on first selection of item
2016-11-03 14:54:06 +05:30
Nabin Hait
72a1943c8e
Fixed version conflict
2016-10-26 16:41:21 +05:30
Rohit Waghchaure
43b508089e
[Fix] Pricing rule discount issue
2016-10-24 16:16:24 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
6c49fa20b5
Fixed precision of rate field
2016-10-05 11:28:02 +05:30
Nabin Hait
2490ea0b91
Fixed merge conflict
2016-09-01 12:29:31 +05:30
Rohit Waghchaure
d39f53319d
Added zero value condition
2016-08-31 02:09:15 +05:30
Rohit Waghchaure
609e2b4ca3
[POS] Currency format issue
2016-08-31 02:04:53 +05:30
Rohit Waghchaure
a57bf5ee2e
[fix] Precision issue for field conversion rate in POS
2016-08-30 01:05:01 +05:30
Nabin Hait
338e63c448
Fixed version conflict
2016-08-29 11:47:50 +05:30
Rohit Waghchaure
63bdd679d0
[POS] Fixes and cleanup
2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012
Coded column deleted, column added from UI
2016-08-26 14:32:38 +05:30
Rohit Waghchaure
efb5bf2cfc
[POS] Fixed payment gl entry for sales return
2016-08-25 16:23:47 +05:30
Rohit Waghchaure
baef2624a2
Given provision to enter write off and change amount on POS
2016-08-10 00:50:53 +05:30
Rohit Waghchaure
7127a8f522
Allow user to edit change amount from sales invoice form for is pos
2016-08-08 23:19:18 +05:30
Nabin Hait
3bb1a421f0
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
2016-08-02 16:41:15 +05:30
