rohitwaghchaure
|
45d45f4247
|
[hotfix] Wrong calculation of total in taxes and totals (#10924)
|
2017-09-27 11:49:13 +05:30 |
|
Prateeksha Singh
|
df8fbd7d72
|
[fix] batch qty checked against stock_qty field (#10906)
|
2017-09-26 17:16:03 +05:30 |
|
Nabin Hait
|
8ff0a64ac2
|
Merge branch 'staging'
|
2017-09-26 15:59:12 +05:30 |
|
Nabin Hait
|
c0b4f0e81b
|
bumped to version 9.0.0
|
2017-09-26 16:29:12 +06:00 |
|
Nabin Hait
|
b0ba55e52f
|
Set bill no while making payment entry from purchase invoice
|
2017-09-26 15:56:58 +05:30 |
|
rohitwaghchaure
|
d4c2d77bba
|
[fix] POS not working if user clicks on back button from form view (#10912)
|
2017-09-26 13:27:06 +05:30 |
|
Prateeksha Singh
|
ada8ba96b3
|
[setup] remove translations from action name (#10911)
|
2017-09-26 13:07:24 +05:30 |
|
Nabin Hait
|
773e686fb1
|
change log for version 9
|
2017-09-26 12:41:43 +05:30 |
|
Nabin Hait
|
360c1efd18
|
Merge branch 'master' into staging
|
2017-09-25 16:36:47 +05:30 |
|
Nabin Hait
|
a0b85cd1ec
|
Merge branch 'hotfix'
|
2017-09-25 16:36:45 +05:30 |
|
Nabin Hait
|
9ef023b10f
|
bumped to version 8.11.6
|
2017-09-25 17:06:44 +06:00 |
|
Nabin Hait
|
0d0811ca14
|
reload print style
|
2017-09-25 16:33:45 +05:30 |
|
Nabin Hait
|
39c2f75e6d
|
Merge branch 'master' into staging
|
2017-09-25 16:03:32 +05:30 |
|
Nabin Hait
|
3ab938ea34
|
Merge branch 'hotfix'
|
2017-09-25 16:03:29 +05:30 |
|
Nabin Hait
|
7da3c46ef2
|
bumped to version 8.11.5
|
2017-09-25 16:33:29 +06:00 |
|
tundebabzy
|
e4be3f8dc9
|
use generator when updating and notify user of long process (#10777)
|
2017-09-21 18:27:33 +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 |
|
rohitwaghchaure
|
12fd8a6047
|
[fix] User not able to complete the production order because of decimal issue (#10868)
|
2017-09-21 14:39:10 +05:30 |
|
Nabin Hait
|
24ec3c7dcb
|
Fixed merge conflict
|
2017-09-21 12:53:41 +05:30 |
|
Vishal Dhayagude
|
c4c2c56af2
|
env variable added (#10847)
|
2017-09-21 12:07:56 +05:30 |
|
Prateeksha Singh
|
705d885b64
|
[progress] R/W permission for all roles (#10866)
|
2017-09-21 12:02:18 +05:30 |
|
Manas Solanki
|
1c1dd08a34
|
only validate party account and ref doc party account in selected case (#10863)
* only validate party account and ref doc party account in selected case
* fix for fee structure test
* fix the assessment result test
|
2017-09-21 12:01:20 +05:30 |
|
Nabin Hait
|
b2dca79d89
|
Updated modified timestamp in sales/purchase transaction doctypes
|
2017-09-20 09:56:06 +05:30 |
|
Nabin Hait
|
6960a76adc
|
Fixes related to schools fees
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
0664d6ed8b
|
real time fee creation status via socketio
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
1bcc6c661a
|
minor changes
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
9b44c16a32
|
add the fee schedule in config
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
1299d56e85
|
cleanup of the fee module
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
8c88af23ef
|
added the test case for the fees
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
d1d2633658
|
removed the fee schedule
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
152ba1eccb
|
fixes as per the review
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
49c52f7639
|
renamed one doctype to the fee schedule
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
4e0559bc79
|
make payment entry for the fees
|
2017-09-19 17:23:03 +05:30 |
|
Manas Solanki
|
2b39d5d6d5
|
make gl_entry on submission of fees
|
2017-09-19 17:23:02 +05:30 |
|
Manas Solanki
|
e4acf763a5
|
make payment request for the fee
|
2017-09-19 17:23:02 +05:30 |
|
Manas Solanki
|
f073814635
|
added fee request doctype
|
2017-09-19 17:23:02 +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 |
|
rohitwaghchaure
|
f551b43a94
|
Merge pull request #10841 from rohitwaghchaure/subscription_patch_fix_docststus
[fix] Subscription patch broken if reference document has been cancelled
|
2017-09-19 13:24:04 +05:30 |
|
Rohit Waghchaure
|
c15a3bd379
|
[fix] Subscription patch broken if reference document has been cancelled
|
2017-09-19 12:53:11 +05:30 |
|
Nabin Hait
|
caf9891075
|
Fixed merge conflict
|
2017-09-19 12:06:22 +05:30 |
|
Nabin Hait
|
bd4b80e3d8
|
Merge branch 'master' into develop
|
2017-09-19 12:05:41 +05:30 |
|
Nabin Hait
|
9930eb0a7a
|
Merge branch 'hotfix'
|
2017-09-19 12:05:39 +05:30 |
|
Nabin Hait
|
703e837125
|
bumped to version 8.11.4
|
2017-09-19 12:35:39 +06:00 |
|
rohitwaghchaure
|
4f0f144142
|
Merge pull request #10831 from rohitwaghchaure/cherry_pick_subscription_staging_to_develop
Cherry pick staging to develop for subscription cleanup
|
2017-09-19 10:26:20 +05:30 |
|
Nabin Hait
|
cf36534eed
|
Gross profit report considering returned items (#10734)
|
2017-09-18 19:13:45 +05:30 |
|
rohitwaghchaure
|
d02744b436
|
[fix] Subscription patch (#10827)
|
2017-09-18 17:23:00 +05:30 |
|
rohitwaghchaure
|
850eaa73b0
|
Move subscription module to accounts (#10772)
|
2017-09-18 17:23:00 +05:30 |
|
Nabin Hait
|
e859671eb3
|
Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706)" (#10830)
This reverts commit d258372f9e.
|
2017-09-18 17:22:46 +05:30 |
|
Neil Trini Lasrado
|
d258372f9e
|
Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706)
|
2017-09-18 17:12:16 +05:30 |
|
tundebabzy
|
f6d738b3c5
|
Delivery note to billing issue (#10726) (#10766)
* allow invoices to be made from sales returns
* Update queries.py
|
2017-09-18 17:10:09 +05:30 |
|