Nabin Hait
|
294664b24c
|
Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
|
2016-09-12 13:03:14 +05:30 |
|
Saurabh
|
b835fef8ac
|
[enhancement] modify payment request to get payment url (#6097)
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
|
2016-09-09 11:19:22 +05:30 |
|
Nabin Hait
|
0a0df2e433
|
fixed version conflict
|
2016-09-07 17:01:47 +05:30 |
|
Nabin Hait
|
23147ff881
|
Patch fixed
|
2016-09-07 16:59:55 +05:30 |
|
pawan
|
7b2bd20a09
|
[fix] #6254
|
2016-09-06 18:28:41 +05:30 |
|
Nabin Hait
|
406f0a38de
|
Fixed merge conflicts
|
2016-09-05 15:44:18 +05:30 |
|
Nabin Hait
|
8693b5c93a
|
Minor fixes
|
2016-09-05 11:51:45 +05:30 |
|
pawan
|
bd9a275d5f
|
[fix] #6254
|
2016-09-02 16:51:22 +05:30 |
|
Nabin Hait
|
15b26d8b1a
|
Fixed merge conflicts
|
2016-09-02 14:29:57 +05:30 |
|
Nabin Hait
|
5a4ca64c4a
|
Party name in Payment Entry and cheque print format
|
2016-09-02 14:20:01 +05:30 |
|
Saurabh
|
ff910f4c72
|
[fixes] set filter for warehouse
|
2016-09-02 13:39:05 +05:30 |
|
Nabin Hait
|
2490ea0b91
|
Fixed merge conflict
|
2016-09-01 12:29:31 +05:30 |
|
Rohit Waghchaure
|
774ce63b75
|
remove mode of payment, migrate mode of payment from v6 to v7
|
2016-08-31 21:21:41 +05:30 |
|
Rohit Waghchaure
|
879cb6ebee
|
[POS] Fixed POS Sales Invoice when Payment Table is Empty
|
2016-08-31 14:41:48 +05:30 |
|
Nabin Hait
|
566759acae
|
Merge pull request #6211 from rohitwaghchaure/v7.1_fixes
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-31 12:12:48 +05:30 |
|
Rohit Waghchaure
|
a2bf16bfaa
|
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-29 13:37:13 +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
|
0cb171feb2
|
[Enhancement] Added billing hours for account user in timesheet
|
2016-08-26 13:17:46 +05:30 |
|
Nabin Hait
|
e334813daf
|
Merge pull request #6166 from neilLasrado/demo
Merged Schools Demo into ERPNext
|
2016-08-26 13:05:43 +05:30 |
|
Nabin Hait
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Nabin Hait
|
06b27757ab
|
Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
[Sales Return] Minor fix in patch
|
2016-08-26 12:33:33 +05:30 |
|
Rohit Waghchaure
|
e21e1ebae2
|
[Sales Return] Minor fix in patch
|
2016-08-26 12:31:41 +05:30 |
|
Nabin Hait
|
0a99b4347b
|
Party mandatory message
|
2016-08-26 12:30:45 +05:30 |
|
Nabin Hait
|
a26bb96d2d
|
Merge pull request #6178 from nabinhait/status_updater_fix
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 12:09:39 +05:30 |
|
Nabin Hait
|
47a3f639ed
|
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 11:39:39 +05:30 |
|
Neil Trini Lasrado
|
067245933e
|
Fixed Demo
|
2016-08-25 18:31:42 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Nabin Hait
|
cfbd0199eb
|
Merge branch 'master' into develop
|
2016-08-23 12:10:56 +05:30 |
|
Rohit Waghchaure
|
713e2b7b62
|
[POS] Fixed issue of paid amount, write off account
|
2016-08-19 19:27:16 +05:30 |
|
Nabin Hait
|
b5951b72f3
|
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
Formula based Salary Structure
|
2016-08-18 16:39:58 +05:30 |
|
Nabin Hait
|
f04ce3c5a6
|
[fix] check expense agaist budget
|
2016-08-18 16:14:23 +05:30 |
|
Rohit Waghchaure
|
9d5a07d101
|
[POS] Fixed stock update issue
|
2016-08-18 13:27:06 +05:30 |
|
Kanchan Chauhan
|
bccf0fa041
|
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
|
2016-08-18 13:02:39 +05:30 |
|
Rushabh Mehta
|
b7bc6bd75d
|
[fix] better message for cost center, fixes #6109
|
2016-08-18 12:50:58 +05:30 |
|
Rushabh Mehta
|
b969c2cb60
|
[minor] budget link in cost center, fixes #6093
|
2016-08-18 12:36:20 +05:30 |
|
Nabin Hait
|
6fe3ac49cf
|
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
Allow to edit change amount
|
2016-08-17 17:08:54 +05:30 |
|
Rohit Waghchaure
|
e4e69ec027
|
changed field name, validation for change amount account, validation for serial no qty
|
2016-08-17 16:20:13 +05:30 |
|
Nabin Hait
|
95c998109d
|
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
Validate on changing from Total to Valuation/Valuation&Total when add…
|
2016-08-17 12:12:14 +05:30 |
|
Nabin Hait
|
4da2c81641
|
Merge pull request #6094 from rmehta/sales-purchase-items
[revert] is_sales_item, is_purchase_item back
|
2016-08-17 11:30:37 +05:30 |
|
Rushabh Mehta
|
d973c1606a
|
[revert] is_sales_item, is_purchase_item back
|
2016-08-16 11:32:08 +05:30 |
|
Rohit Waghchaure
|
9cd356c7f0
|
[POS] Fixed print qty decimal issue
|
2016-08-16 10:44:21 +05:30 |
|
Rohit Waghchaure
|
033ed00c56
|
[POS] fixed issue of negative stock
|
2016-08-11 16:37:29 +05:30 |
|
Rohit Waghchaure
|
315a5e1b4d
|
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
|
2016-08-11 00:35:00 +05:30 |
|
Rushabh Mehta
|
185c247286
|
Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue
[Fix] Get account of the mode of payment on sales invoice and pos profile
|
2016-08-10 14:25:42 +05:30 |
|
pawan mehta
|
399a4bf201
|
[fix] #5723
|
2016-08-10 13:20:16 +05:30 |
|
Rohit Waghchaure
|
70be24d6f0
|
[Fix] Get account of the mode of payment on sales invoice and pos profile
|
2016-08-10 13:16:39 +05:30 |
|
aruizramon
|
8bd2487533
|
semicolon
|
2016-08-09 16:04:45 -04:00 |
|
Alec Ruiz-Ramon
|
08fb39f1ba
|
Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct'
|
2016-08-09 15:38:34 -04:00 |
|