Nabin Hait
|
96abfd2ab9
|
[fix] In payment entry, run some events serially to avoid async issue
|
2017-11-22 15:13:16 +05:30 |
|
Nabin Hait
|
036bf6de6e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2017-11-21 20:19:13 +05:30 |
|
Nabin Hait
|
32a62a02df
|
Fixed merge conflict
|
2017-11-21 20:18:03 +05:30 |
|
Nabin Hait
|
0551f7bb00
|
Cleanup and fixes of payment terms feature
|
2017-11-21 19:58:16 +05:30 |
|
Zarrar
|
657ceef105
|
skipped tax_account (#11678)
|
2017-11-21 17:40:22 +05:30 |
|
Faris Ansari
|
6ca6a69070
|
Course Scheduling Tool (#11676)
* [education] Fix Course Scheduling Tool
* minor
|
2017-11-21 17:28:51 +05:30 |
|
Rushabh Mehta
|
476c66d699
|
[fix] tests.txt
|
2017-11-21 17:02:39 +05:30 |
|
Rushabh Mehta
|
26ca6afd11
|
[fix] test.txt for accounts
|
2017-11-21 16:17:58 +05:30 |
|
rohitwaghchaure
|
e8ccc0e942
|
[enhance] Added multi UOM feature in Material Request (#11352)
* [enhance] Added multi UOM in Material Request
* test cases
* patch to update multi uom fields in material request item
|
2017-11-21 16:17:22 +05:30 |
|
Makarand Bauskar
|
75443a94ee
|
[minor] set the pos profile name while creating demo (#11664)
|
2017-11-21 16:12:40 +05:30 |
|
Zarrar
|
f71f3af938
|
adding task to root node (#11666)
|
2017-11-21 16:12:01 +05:30 |
|
Saurabh
|
5add4897a5
|
Merge pull request #11506 from saurabh6790/test_patches
[travis] run patches by restoring v7 database
|
2017-11-21 15:56:54 +05:30 |
|
Saurabh
|
6edf12540a
|
Merge pull request #11675 from saurabh6790/test-case-path-fixes
[fix] ui test-case path
|
2017-11-21 15:56:23 +05:30 |
|
Saurabh
|
d503f12713
|
[fix] ui test-case path
|
2017-11-21 15:22:41 +05:30 |
|
Rushabh Mehta
|
5171da81a1
|
[minor] fix-patch
|
2017-11-21 15:18:47 +05:30 |
|
Nabin Hait
|
cc884578b5
|
Update sales_order.py
|
2017-11-21 12:24:03 +05:30 |
|
rohitwaghchaure
|
834541a7e8
|
[fix] Added primary action in the modal which will show on the submission in the pos (#11575)
|
2017-11-20 11:31:53 +05:30 |
|
Britlog
|
1484793055
|
Shopping cart addresses management (#11657)
|
2017-11-20 11:22:18 +05:30 |
|
rohitwaghchaure
|
179e0c1d8d
|
Added party name in accounts receivable/payable report (#11656)
|
2017-11-20 11:18:55 +05:30 |
|
creamdory
|
fd1503c6a5
|
[New Feature] Delivery
|
2017-11-20 10:28:49 +08:00 |
|
rohitwaghchaure
|
34d6340be6
|
Merge pull request #11647 from rohitwaghchaure/pos_selling_price_issue
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
|
2017-11-18 21:33:32 +05:30 |
|
Rohit Waghchaure
|
77940493a8
|
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
|
2017-11-18 19:06:31 +05:30 |
|
Prateeksha Singh
|
e1b8629313
|
Fix setup wiz test (#11640)
* increase timeout in setup wiz test
* enable profile slide
|
2017-11-17 20:08:45 +05:30 |
|
KanchanChauhan
|
0fe455a991
|
[Minor][Bug] Fix syntax error (#11633)
|
2017-11-17 20:08:15 +05:30 |
|
Saurabh
|
00e82cdab3
|
[fix] patch fixes to setup patch tester on travis
|
2017-11-17 19:08:01 +05:30 |
|
Saurabh
|
a8823eadb6
|
[travis] run patches by restoring v7 database
|
2017-11-17 19:08:01 +05:30 |
|
Prateeksha Singh
|
241d64d8c1
|
Merge pull request #11634 from pratu16x7/variant-modal-fix
[minor] fix plurals spacing
|
2017-11-17 15:34:34 +05:30 |
|
pratu16x7
|
83587c72f6
|
[minor] fix plurals spacing
|
2017-11-17 15:33:12 +05:30 |
|
Saurabh
|
a4f78211ab
|
Merge branch 'master' into develop
|
2017-11-17 14:55:24 +05:30 |
|
Saurabh
|
a5b53e9480
|
Merge branch 'hotfix'
|
2017-11-17 14:55:23 +05:30 |
|
Saurabh
|
f773af6053
|
bumped to version 9.2.15
|
2017-11-17 15:25:23 +06:00 |
|
Saurabh
|
119a50e228
|
Merge pull request #11630 from saurabh6790/domain_settings_fix
[fix] set default language in local
|
2017-11-17 14:54:38 +05:30 |
|
Saurabh
|
11ec2c50e0
|
[fix] set default language in local
|
2017-11-17 14:51:08 +05:30 |
|
Zarrar
|
1b4894c33a
|
make root_type null if not root (#11626)
|
2017-11-17 14:32:12 +05:30 |
|
Rushabh Mehta
|
30dc9a14c6
|
[feature] [refactor] Shipping Rule for Buying + Refactor (#11628)
* Shipping rule for Buying
* [refactor] shipping rule
|
2017-11-17 14:31:09 +05:30 |
|
Saurabh
|
66e65dc104
|
[fix] merge-conflicts
|
2017-11-17 14:03:13 +05:30 |
|
Saurabh
|
1e74519726
|
Merge branch 'hotfix'
|
2017-11-17 14:01:30 +05:30 |
|
Saurabh
|
05ed86a00e
|
bumped to version 9.2.14
|
2017-11-17 14:31:29 +06:00 |
|
Saurabh
|
d40ae81fc9
|
Merge pull request #11627 from rohitwaghchaure/pos_redirect_issue
[fix] POS redirect issue
|
2017-11-17 13:55:10 +05:30 |
|
Rohit Waghchaure
|
44f7b157ff
|
[fix] POS redirect issue
|
2017-11-17 13:52:11 +05:30 |
|
Nabin Hait
|
7fa111de45
|
Update sales_invoice.py
|
2017-11-17 12:55:08 +05:30 |
|
Nabin Hait
|
6b70906deb
|
Update purchase_invoice.py
|
2017-11-17 12:54:32 +05:30 |
|
Nabin Hait
|
1c4653ed97
|
Merge branch 'develop' into payment-terms
|
2017-11-17 12:41:56 +05:30 |
|
Saurabh
|
3499ba08df
|
[fix] do not translate domains while creating db record (#11616)
|
2017-11-17 12:29:26 +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 |
|
Nabin Hait
|
1783549e75
|
Minor fixes in patch
|
2017-11-17 12:20:07 +05:30 |
|
Rushabh Mehta
|
58dccf38c5
|
[fix] for tests
|
2017-11-17 12:12:53 +05:30 |
|
Prateeksha Singh
|
744ff0010b
|
Variant report (#11618)
* Item Variant Details Report
* remove queries from inside for loop
* make attribute value map
* Update item_variant_details.py
|
2017-11-17 12:00:29 +05:30 |
|
hiousi
|
d81e9f30dd
|
[fix] issue #11456 (#11612)
using bench export-fixtures create a erpnext/fixtures/web_form.json file
see :
https://github.com/frappe/erpnext/issues/11456#issuecomment-344846063
|
2017-11-17 11:42:24 +05:30 |
|
Britlog
|
b6096057c6
|
Hide cart icon and badge count after logging out (#11530)
|
2017-11-17 11:41:35 +05:30 |
|