Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Akhilesh Darjee
|
c53dbc7cdf
|
[flat discount] implemented flat discount on client side
|
2013-12-25 19:46:20 +05:30 |
|
Rushabh Mehta
|
4b6b377134
|
Removed config.json
|
2013-12-25 17:38:12 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +05:30 |
|
Nabin Hait
|
9a064e9ced
|
Merge pull request #1233 from nabinhait/hotfix
Removed country field from Search Fields
|
2013-12-25 01:01:17 -08:00 |
|
Nabin Hait
|
9dc1b00d87
|
Removed country field from Search Fields
|
2013-12-25 12:28:54 +05:30 |
|
Akhilesh Darjee
|
63aa5fd673
|
[flat discount] implemented flat discount on server side
|
2013-12-24 20:30:03 +05:30 |
|
Rushabh Mehta
|
3c68488873
|
Fixes to setup wizard
|
2013-12-24 18:51:49 +05:30 |
|
Rushabh Mehta
|
30fb30cffb
|
Merge pull request #1 from pdvyas/testing
add travis ci
|
2013-12-24 05:21:21 -08:00 |
|
Pratik Vyas
|
9373ba96d5
|
Merge branch 'develop'
|
2013-12-24 13:12:21 +05:30 |
|
Pratik Vyas
|
a402079cd4
|
bumped to version 3.3.8
|
2013-12-24 13:42:21 +06:00 |
|
Nabin Hait
|
2ca388b0a5
|
Merge pull request #1232 from nabinhait/hotfix
Hotfix
|
2013-12-23 23:29:00 -08:00 |
|
Pratik Vyas
|
f437e867fd
|
add travis ci
|
2013-12-24 12:17:59 +05:30 |
|
Nabin Hait
|
6ebcc5c006
|
Change parent account of warehouse from inside the warehouse
|
2013-12-24 12:14:12 +05:30 |
|
Nabin Hait
|
6a2edee914
|
Fixes in general ledger report
|
2013-12-24 11:58:05 +05:30 |
|
Nabin Hait
|
de69ad0a48
|
Merge pull request #1230 from akhileshdarjee/hotfix
[fix] [minor] update item_name and description in item price
|
2013-12-23 22:09:13 -08:00 |
|
Akhilesh Darjee
|
25a4bd02f4
|
[fix] [minor] update item_name and description in item price
|
2013-12-24 11:32:57 +05:30 |
|
Nabin Hait
|
a3d058938e
|
Company mandatory validation while enabling perpetual inventory
|
2013-12-24 11:03:04 +05:30 |
|
Nabin Hait
|
4cae8a0d54
|
Fixes in stock ledger report
|
2013-12-24 10:47:34 +05:30 |
|
Nabin Hait
|
454b6f9f8a
|
Merge pull request #1229 from nabinhait/hotfix
Fixes in sales return validation
|
2013-12-23 07:05:08 -08:00 |
|
Nabin Hait
|
9f1b59dfc6
|
Fixes in sales return validation
|
2013-12-23 20:34:09 +05:30 |
|
Anand Doshi
|
2926651e1c
|
Restrict Employee and Leave Approver to relevant Employee and Leave Application records
|
2013-12-23 20:01:20 +05:30 |
|
Anand Doshi
|
9b67f4344b
|
Patch to migrate allow_print and allow_email to print and email rights of DocPerm
|
2013-12-23 20:01:20 +05:30 |
|
Anand Doshi
|
68852f25b5
|
Added rights for print and email in DocPerm
|
2013-12-23 20:01:20 +05:30 |
|
Anand Doshi
|
8a436500f0
|
[refactor] Client-side permission handling
|
2013-12-23 20:01:19 +05:30 |
|
Anand Doshi
|
2298d59b8b
|
[patch] new permission system
|
2013-12-23 20:01:19 +05:30 |
|
Anand Doshi
|
620145c59a
|
[minor] patches for restriction
|
2013-12-23 20:01:19 +05:30 |
|
Anand Doshi
|
bcf2422848
|
[minor] user properties and leave application
|
2013-12-23 20:01:19 +05:30 |
|
Anand Doshi
|
83638b5f05
|
[minor] move warehouse user to restrictions
|
2013-12-23 20:01:18 +05:30 |
|
Rushabh Mehta
|
57518fc5f1
|
[cleanup] [minor] default+cache related
|
2013-12-23 20:01:18 +05:30 |
|
Rushabh Mehta
|
fea93d0f65
|
[cleanup] [minor] added webnotes.model.delete_doc (module)
|
2013-12-23 20:01:18 +05:30 |
|
Rushabh Mehta
|
b1ea6b1f66
|
[permissions] Added Test Cases
|
2013-12-23 20:01:18 +05:30 |
|
Rushabh Mehta
|
497d363fc1
|
[permission model] Redesign
Conflicts:
patches/patch_list.py
|
2013-12-23 20:01:18 +05:30 |
|
Pratik Vyas
|
74f64b67db
|
Merge branch 'develop'
|
2013-12-23 17:31:22 +05:30 |
|
Pratik Vyas
|
2117afba07
|
bumped to version 3.3.7
|
2013-12-23 18:01:22 +06:00 |
|
Nabin Hait
|
e409d0d70b
|
Merge pull request #1227 from akhileshdarjee/hotfix
[fix] [minor] update item price on change of item details
|
2013-12-23 03:42:08 -08:00 |
|
Nabin Hait
|
50125b35d2
|
Merge pull request #1228 from nabinhait/hotfix
Hotfix
|
2013-12-23 03:41:13 -08:00 |
|
Nabin Hait
|
c38527ef5f
|
Show general/stock ledger button links to new query reports
|
2013-12-23 17:07:57 +05:30 |
|
Nabin Hait
|
facde47c6c
|
Stock ledger report filter by item and brand
|
2013-12-23 17:06:46 +05:30 |
|
Nabin Hait
|
20dc79ac99
|
General ledger filter by account group
|
2013-12-23 17:06:10 +05:30 |
|
Akhilesh Darjee
|
61da43f793
|
[fix] [minor] update modified date and time to item price when updating item and price list
|
2013-12-23 16:24:33 +05:30 |
|
Akhilesh Darjee
|
af30c3fdfd
|
[fix] [minor] update item price on change of item details
|
2013-12-23 16:13:42 +05:30 |
|
Rushabh Mehta
|
b63d550a70
|
Added Applications page and fixed issues in translations and hooks
|
2013-12-23 16:09:00 +05:30 |
|
Akhilesh Darjee
|
b09dc46e68
|
[flat discount] first commit
|
2013-12-23 15:49:08 +05:30 |
|
Pratik Vyas
|
68888a21ec
|
Merge branch 'develop'
|
2013-12-23 14:41:05 +05:30 |
|
Pratik Vyas
|
7d7661c9ed
|
bumped to version 3.3.6
|
2013-12-23 15:11:05 +06:00 |
|
Nabin Hait
|
fbda00eef0
|
Merge pull request #1225 from nabinhait/hotfix
Fixes in Stock ageing report
|
2013-12-22 22:53:13 -08:00 |
|
Nabin Hait
|
a0212d8014
|
Fixes in Stock ageing report
|
2013-12-23 12:21:14 +05:30 |
|
Nabin Hait
|
c8d2604afc
|
Merge pull request #1224 from nabinhait/hotfix
Incoming rate for stock ledger entry should not be rounded
|
2013-12-22 22:50:41 -08:00 |
|
Nabin Hait
|
861453279d
|
Incoming rate for stock ledger entry should not be rounded
|
2013-12-23 12:14:45 +05:30 |
|