Saurabh
|
5b7503c074
|
Merge pull request #13691 from saurabh6790/supp_180417_1
[hotfix] multiple fixes
|
2018-04-19 15:57:35 +05:30 |
|
Rohit Waghchaure
|
8441dd9184
|
[Fix] Item with special character not adding in the POS cart
|
2018-04-19 12:55:06 +05:30 |
|
Julian Robbins
|
78869f1e77
|
Update manual-feedback-request.md (#13709)
Changed wording to reflect current wording of Feedback Request rather than 'Ask a Feedback'
|
2018-04-18 03:12:30 -08:00 |
|
Rushabh Mehta
|
ff8f1bc88e
|
Revert "removed bad code and made compatible with pip 10 (#13685)" (#13713)
This reverts commit 91b0dce4d8.
|
2018-04-18 02:57:44 -08:00 |
|
Ameya Shenoy
|
91b0dce4d8
|
removed bad code and made compatible with pip 10 (#13685)
|
2018-04-18 02:57:04 -08:00 |
|
Zarrar
|
59f7b8c4a1
|
issue routing to report (#13710)
|
2018-04-18 02:56:02 -08:00 |
|
Saurabh
|
2476a8aab9
|
a[fix] check content before making in condition
|
2018-04-17 20:45:06 +05:30 |
|
Saurabh
|
46ffbb74ff
|
fix cheque print measurements
|
2018-04-17 20:44:37 +05:30 |
|
tundebabzy
|
280c7a410a
|
code review: make use of db_insert and change Auto Repeat to auto_repeat
|
2018-04-17 11:32:17 +01:00 |
|
tundebabzy
|
20721942ad
|
code review: use delete from to delete records
|
2018-04-17 11:31:23 +01:00 |
|
tundebabzy
|
5988da9a31
|
code review: revert changes
|
2018-04-17 11:30:35 +01:00 |
|
Saurabh
|
492aff2a8b
|
[fix] check if academic_year exists (#13665)
|
2018-04-17 14:21:40 +05:30 |
|
tundebabzy
|
caae0f4dcc
|
Merge branch 'develop' into new-subscription
|
2018-04-17 09:34:04 +01:00 |
|
matmyers
|
742da8cfce
|
removed duplicate keys (#13675)
|
2018-04-17 12:20:57 +05:30 |
|
Saurabh
|
46743d00d6
|
Merge branch 'master' into develop
|
2018-04-17 12:00:21 +05:30 |
|
Saurabh
|
c3fbc04aab
|
Merge branch 'hotfix'
|
2018-04-17 12:00:19 +05:30 |
|
Saurabh
|
5b866db6bc
|
bumped to version 10.1.23
|
2018-04-17 12:30:19 +06:00 |
|
Saurabh
|
9fbb8192e1
|
[fix] do not escape % while using clause (#13677)
|
2018-04-17 11:56:46 +05:30 |
|
Faris Ansari
|
d7a3b78fdf
|
[py3] Cast dict_keys to list (#13663)
|
2018-04-16 14:39:37 +05:30 |
|
Saurabh
|
ea1408f2e0
|
[fix] enqueue salary slip print email after completing accounting entries (#13633)
|
2018-04-15 21:38:49 -08:00 |
|
Saurabh
|
f2a941b1a4
|
[fix] check if supplier value exists (#13616)
|
2018-04-15 21:37:14 -08:00 |
|
Sanjay Kumar
|
bc83daf0fa
|
#13478 : Default Accounts in Item from Item Group (#13635)
* remove external app reference and update get_warehouse_list
* resolve #13478 : Default Accounts in Item from Item Group
|
2018-04-15 21:36:37 -08:00 |
|
Saurabh
|
ea49deb315
|
Merge branch 'master' into develop
|
2018-04-15 12:54:50 +05:30 |
|
Saurabh
|
ca1cfd91ea
|
Merge branch 'hotfix'
|
2018-04-15 12:54:49 +05:30 |
|
Saurabh
|
c3d43e672b
|
bumped to version 10.1.22
|
2018-04-15 13:24:49 +06:00 |
|
Saurabh
|
e141fdcfcc
|
Merge pull request #13661 from codingCoffee/pip10
Compatibility for pip 10
|
2018-04-15 12:43:28 +05:30 |
|
Ameya Shenoy
|
7cb8f890bc
|
Compatibility for pip 10
- also some spaces and tabs fixes
|
2018-04-15 03:43:21 +05:30 |
|
Sathisha Poojary
|
16ce8ed7d5
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2018-04-14 12:05:11 +05:30 |
|
Faris Ansari
|
ed34a442a8
|
Obey currency filter in financial statement prints #pdd (#13648)
|
2018-04-13 21:34:00 -08:00 |
|
Shreya Shah
|
a952e40b56
|
fix tab (#13651)
|
2018-04-13 19:33:40 +05:30 |
|
Shreya Shah
|
6bf4e5b73b
|
Department Tree (#13567)
* Department Tree
* print hide fields
* create 'All Departments' as parent on setup
* patch to set lft rgt
* fix translatable string
|
2018-04-13 15:09:26 +05:30 |
|
Nabin Hait
|
642d39098a
|
Fixed merge conflict
|
2018-04-13 14:38:57 +05:30 |
|
Nabin Hait
|
d6aadef395
|
Merge branch 'hotfix'
|
2018-04-13 14:38:23 +05:30 |
|
Nabin Hait
|
11c899bc1f
|
bumped to version 10.1.21
|
2018-04-13 15:08:22 +06:00 |
|
Nabin Hait
|
00efeb26f4
|
Email Account field added in Issue
|
2018-04-13 14:30:26 +05:30 |
|
Nabin Hait
|
4566d1f60c
|
Email Account field added in Issue
|
2018-04-13 13:26:06 +05:30 |
|
Faris Ansari
|
f8dd4c2d7b
|
[fix] Financial report column values during print (#13627)
|
2018-04-12 17:28:40 +05:30 |
|
Siddhi Sawant
|
a0bbc0846b
|
GST purchase invoice with tax breakup details (#13561)
|
2018-04-12 14:50:48 +05:30 |
|
rohitwaghchaure
|
1129ac711e
|
[Fix] Patch (#13610)
|
2018-04-12 14:48:23 +05:30 |
|
rohitwaghchaure
|
2ea593bdd8
|
[Fix] POS Profile data not set in the sales invoice (#13568)
|
2018-04-12 13:37:08 +05:30 |
|
Frappe PR Bot
|
59a2a653d0
|
[Translation] Updated Translations (#13570)
|
2018-04-12 13:36:55 +05:30 |
|
Ahmed Madi
|
02fd6f56d6
|
Update leave_application.py (#13575)
Make get_holidays function white listed
|
2018-04-12 13:31:50 +05:30 |
|
Pawan Mehta
|
c0727633e7
|
[fix] #13589 (#13590)
|
2018-04-12 13:31:08 +05:30 |
|
rohitwaghchaure
|
098b444f6f
|
[minor] Toggle required opportunity item table based on with items field (#13584)
|
2018-04-12 13:26:50 +05:30 |
|
rohitwaghchaure
|
e72bde5159
|
Removed expired items from the list of POS items (#13582)
|
2018-04-12 13:26:11 +05:30 |
|
Nabin Hait
|
c10e106f8f
|
Optimization related to large number of items (#13606)
|
2018-04-12 13:25:03 +05:30 |
|
Ameya Shenoy
|
848d34f1a8
|
Minor fixes (#13609)
- typo renamed make_prod_order_test_record to make_wo_order_test_record,
whereever it was missed
|
2018-04-12 13:21:16 +05:30 |
|
rohitwaghchaure
|
2c111b7b14
|
Minor fix (#13600)
|
2018-04-11 02:20:06 -08:00 |
|
Sanjay Kumar
|
6225b769a6
|
remove external app reference and update get_warehouse_list (#13597)
|
2018-04-11 02:19:36 -08:00 |
|
Rushabh Mehta
|
fb5d678b0c
|
[minor] cache refactor and workflow docs (#13598)
|
2018-04-11 00:38:19 -08:00 |
|