Commit Graph

9822 Commits

Author SHA1 Message Date
Nabin Hait
e4475c635d Merge pull request #2211 from nabinhait/hotfix
Escaped single quote in authorization control queries
2014-09-18 13:01:33 +05:30
Anand Doshi
8370cb3e71 Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop 2014-09-18 12:06:05 +05:30
Nabin Hait
4073880ecf Escaped single quote in authorization control queries 2014-09-18 11:01:26 +05:30
Nabin Hait
763c7a56dc Merge pull request #2209 from nabinhait/hotfix
Minor fix in gross profit report
2014-09-17 14:02:51 +05:30
Nabin Hait
556fbc487d Minor fix in gross profit report 2014-09-17 12:13:44 +05:30
Pratik Vyas
54938d431c Merge branch 'develop' 2014-09-16 15:58:28 +05:30
Pratik Vyas
31c61e7eae bumped to version 4.4.0 2014-09-16 16:28:28 +06:00
Anand Doshi
a23151b138 Merge pull request #2202 from 81552433qqcom/develop
hotfix for project wise report and translation.
2014-09-16 15:23:34 +05:30
Anand Doshi
11b75759d2 Merge pull request #2194 from ankitjavalkarwork/stockbalreport
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Rushabh Mehta
a2c562fea4 Update CONTRIBUTING.md 2014-09-16 15:21:43 +05:30
Anand Doshi
8950abc36f Merge pull request #2197 from anandpdoshi/anand-september-15
[minor] removed Suggest
2014-09-16 15:18:57 +05:30
Anand Doshi
27c7226d97 Merge pull request #2201 from nabinhait/hotfix
Columns added in report and fixes in customer's account creation
2014-09-16 15:18:31 +05:30
81552433qqcom
1db294e837 hotfix for project wise report
translation patch for email digest and support ticket.
2014-09-16 16:49:58 +08:00
Nabin Hait
16e943f120 Removed link of item-wise last purchase rate from buying home page 2014-09-16 12:57:31 +05:30
Nabin Hait
9d610214cf Strip party name before checking for account 2014-09-16 12:28:40 +05:30
Nabin Hait
c25681c36c Added item group and brand in sales-person-wise transaction summary report 2014-09-16 12:28:40 +05:30
Nabin Hait
1aea75261d Merge pull request #2200 from nabinhait/hotfix
Minor fix
2014-09-16 11:28:15 +05:30
Nabin Hait
5cd20e3d24 Minor fix 2014-09-16 11:26:53 +05:30
Nabin Hait
9968c7ef70 Merge pull request #2199 from nabinhait/hotfix
Minor fix
2014-09-16 11:25:06 +05:30
Nabin Hait
ca260618d8 Minor fix 2014-09-16 11:24:25 +05:30
Anand Doshi
30c5b41398 [minor] removed Suggest 2014-09-15 16:43:34 +05:30
Sambhaji Kolate
f37d4337a4 fix test for purchase order 2014-09-15 13:37:46 +05:30
Anand Doshi
93c2adb2cd Merge pull request #2193 from anandpdoshi/anand-september-15
Recurring fix, cherry-picked nabin's address template fix
2014-09-15 13:04:12 +05:30
Sambhaji Kolate
525ab0a925 fix build 2014-09-15 12:57:58 +05:30
Anand Doshi
a92c6886cd Merge pull request #2173 from ankitjavalkarwork/fix2043
Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
2014-09-15 12:56:51 +05:30
Anand Doshi
01d171756b [fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation 2014-09-15 12:50:37 +05:30
Sambhaji Kolate
930e7f5578 fix conflict 2014-09-15 12:43:48 +05:30
Sambhaji Kolate
d14e15d432 fix conflict 2014-09-15 12:31:44 +05:30
Sambhaji Kolate
4d3a18890b fix conflict 2014-09-15 12:20:11 +05:30
Nabin Hait
65bef02607 Fixes in address template 2014-09-15 12:18:28 +05:30
Rushabh Mehta
cb9331ddca Merge pull request #2191 from 81552433qqcom/develop
#2190 hotfix, item page
2014-09-15 10:13:09 +05:30
81552433qqcom
ac0c3fb696 #2190 hotfix, item page 2014-09-15 10:21:36 +08:00
Anand Doshi
a844fb78bb Merge branch '81552433qqcom-master' into develop 2014-09-12 16:23:08 +05:30
81552433qqcom
6d02939256 changed indent. as well use tab instead of space. 2014-09-12 16:22:28 +05:30
81552433qqcom
e3b63f2d9c added __() for options that need label. 2014-09-12 16:07:12 +05:30
81552433qqcom
1c440b3b31 month options doesn't get translated. 2014-09-12 16:07:12 +05:30
81552433qqcom
c5a0ef8399 fix according to the suggestion. 2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42 translations. 2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54 various translation missed __() 2014-09-12 16:07:11 +05:30
Anand Doshi
97478b746d Merge pull request #2185 from anandpdoshi/ankit-payment-tool
Payment Tool
2014-09-12 15:53:03 +05:30
Anand Doshi
61a591944b [minor] ui/ux fixes in Payment Tool 2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817 Payment Tool #2106 2014-09-12 15:23:46 +05:30
Anand Doshi
84e08fd534 Merge pull request #2174 from neilLasrado/cost-of-production-cycle-magix
Cost of Production cycle
2014-09-12 14:45:19 +05:30
Anand Doshi
b0e56fa1b5 Merge pull request #2181 from nabinhait/hotfix
Report print format fixed for translated columns
2014-09-12 14:18:52 +05:30
Neil Trini Lasrado
e7c48ed3b0 bom operation inList view fix 2014-09-12 12:08:02 +05:30
Nabin Hait
c432270ca8 Report print format fixed for translated columns 2014-09-12 12:00:47 +05:30
Neil Trini Lasrado
6a7f75c3e3 Cost of Production cycle 2014-09-12 11:25:03 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
ankitjavalkarwork
3df10429db Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form 2014-09-11 16:58:18 +05:30