Kanchan Chauhan
|
2c1f399479
|
Apply Pricing Rule in Shopping Cart
|
2016-11-22 22:23:31 +05:30 |
|
Nabin Hait
|
46753de6d7
|
fixed merge conflict
|
2016-11-17 15:55:11 +05:30 |
|
Saurabh
|
1d210968de
|
[fix] on advance payment entry cancellation delink invoice and pyament entry references
|
2016-11-17 15:21:46 +05:30 |
|
Nabin Hait
|
535462fc20
|
Merge pull request #6947 from saurabh6790/delink_jv_from_advance
[fix] delink jv from advance table
|
2016-11-16 14:22:03 +05:30 |
|
Saurabh
|
8adbfa8a09
|
[test-case] test cases for delinking advance payments
|
2016-11-16 13:43:01 +05:30 |
|
Saurabh
|
866c295989
|
[fix] on jv cancel remove linkings from advance table of Sales/Purchase Invoice
|
2016-11-16 13:43:01 +05:30 |
|
Rohit Waghchaure
|
9b18ed4ffe
|
[Fix] Payment entry, exchange rate is not set properly
|
2016-11-16 12:24:40 +05:30 |
|
Nabin Hait
|
95e6ccd419
|
Merge branch 'master' into develop
|
2016-11-14 12:42:26 +05:30 |
|
Nabin Hait
|
0075c7e659
|
Purchase Order and Receipt links in Purchase Invoice dashboard
|
2016-11-14 12:32:16 +05:30 |
|
Nabin Hait
|
7017dc029a
|
Editable grid columns for payment entry
|
2016-11-14 12:32:16 +05:30 |
|
Nabin Hait
|
ceca1b97c3
|
Fixed merge conflict
|
2016-11-09 14:58:36 +05:30 |
|
Rohit Waghchaure
|
2285f90b64
|
added debit and credit note status
|
2016-11-09 14:47:24 +05:30 |
|
Nabin Hait
|
5ccead5df0
|
Merge pull request #6850 from nabinhait/clear_jv_table
Clear rows from Journal Entry if no debit/credit
|
2016-11-09 11:40:42 +05:30 |
|
Nabin Hait
|
d4e59aa54f
|
Update journal_entry.py
|
2016-11-09 11:38:39 +05:30 |
|
Rohit Waghchaure
|
2f1db57fe1
|
Added status field in sales invoice and purchase invoice
|
2016-11-08 18:49:58 +05:30 |
|
Nabin Hait
|
a469e659c5
|
Fixed merge conflict
|
2016-11-08 15:26:27 +05:30 |
|
Nabin Hait
|
be06cde5f5
|
Update gl_entry.py
|
2016-11-08 13:13:57 +05:30 |
|
Rushabh Mehta
|
13fc52d713
|
[minor] added default standard filters (#6854)
|
2016-11-07 17:19:19 +05:30 |
|
Nabin Hait
|
43eeddfaf6
|
Clear rows from Journal Entry if no debit/credit
|
2016-11-07 15:25:40 +05:30 |
|
Rohit Waghchaure
|
0ecad33642
|
cleanup and fixes
|
2016-11-05 08:09:21 +05:30 |
|
Nabin Hait
|
f5d8dd3b18
|
Fixed merge conflict
|
2016-11-04 16:54:53 +05:30 |
|
Nabin Hait
|
81f7a265bc
|
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
Remember last selected value for link field
|
2016-11-04 16:13:49 +05:30 |
|
Rohit Waghchaure
|
0d2f7e62c0
|
set remember last selected value as true for company field
|
2016-11-03 16:19:34 +05:30 |
|
Nabin Hait
|
eab38cd4eb
|
Merge branch 'master' into develop
|
2016-11-03 15:17:39 +05:30 |
|
Nabin Hait
|
ceca7fbc87
|
Merge pull request #6780 from rohitwaghchaure/float_issue
Change fieldtype from float to currency
|
2016-11-03 10:49:05 +05:30 |
|
Nabin Hait
|
c3b29f6a5b
|
Merge pull request #6738 from KanchanChauhan/name-on-check
Different name on Check
|
2016-11-01 17:29:04 +05:30 |
|
Rohit Waghchaure
|
60e5e4ac2d
|
change fieldtype from float to currency
|
2016-11-01 16:32:33 +05:30 |
|
Nabin Hait
|
f4068fd6f1
|
Fixed merge conflict
|
2016-11-01 15:06:55 +05:30 |
|
Rohit Waghchaure
|
53bb687009
|
hotfix issues
|
2016-11-01 13:21:43 +05:30 |
|
Kanchan Chauhan
|
6b162386ca
|
Different name on Check
|
2016-10-31 17:36:43 +05:30 |
|
Nabin Hait
|
551360ae30
|
Fixed merge conflict
|
2016-10-31 16:38:09 +05:30 |
|
Nabin Hait
|
f5f3ef1bae
|
repost gle for Purchase Invoice with update stock
|
2016-10-31 16:17:10 +05:30 |
|
Nabin Hait
|
bb5e333c1a
|
Update ae_uae_chart_template_standard.json
|
2016-10-28 15:20:31 +05:30 |
|
Saurabh
|
468e41f24f
|
[enhance] introduce ignore_fields param for _tree and get_query
|
2016-10-27 15:23:19 +05:30 |
|
Nabin Hait
|
72a1943c8e
|
Fixed version conflict
|
2016-10-26 16:41:21 +05:30 |
|
Nabin Hait
|
ffd2fc5101
|
[fix] Validate if warehouse is not linked to any account
|
2016-10-24 18:54:07 +05:30 |
|
Rohit Waghchaure
|
43b508089e
|
[Fix] Pricing rule discount issue
|
2016-10-24 16:16:24 +05:30 |
|
Rohit Waghchaure
|
18fa0d8691
|
patch to set default value as 1
|
2016-10-20 16:16:28 +05:30 |
|
Rohit Waghchaure
|
7917ff6936
|
Test cases
|
2016-10-20 16:11:22 +05:30 |
|
Rohit Waghchaure
|
8055bd39ba
|
[Feature] Provision to allow unlink the payment against the invoice
|
2016-10-20 16:11:22 +05:30 |
|
Rohit Waghchaure
|
d23835be84
|
[Feature] Countrywise sales tax template
|
2016-10-20 15:56:07 +05:30 |
|
Nabin Hait
|
fa1cdd5bf0
|
Fixed merge conflict
|
2016-10-18 15:37:33 +05:30 |
|
Nabin Hait
|
f32547a414
|
Merge pull request #6637 from nabinhait/cost_center_fix
Set cost center while creating invoice from SO/PO
|
2016-10-18 15:18:16 +05:30 |
|
Rushabh Mehta
|
17f6874450
|
[minor] [fix] doctype_dasboard.py files, move data to get_data
|
2016-10-18 14:54:39 +05:30 |
|
Nabin Hait
|
55a8797919
|
Set cost center while creating invoice from SO/PO
|
2016-10-18 14:54:17 +05:30 |
|
Nabin Hait
|
395d757c5a
|
Fixed merge conflict
|
2016-10-17 16:42:49 +05:30 |
|
Saurabh
|
afa14fc402
|
[fix][minor] (#6449)
|
2016-10-10 17:17:17 +05:30 |
|
Rohit Waghchaure
|
3485d2467a
|
[Fix] Purchase invoice validation issue
|
2016-10-09 18:05:17 +05:30 |
|
Rushabh Mehta
|
ac5b193100
|
[minor] direct student admission to the list page
|
2016-10-09 15:19:23 +05:30 |
|
Nabin Hait
|
cd9c45f816
|
Fixed merge conflict
|
2016-10-07 16:53:07 +05:30 |
|