Nabin Hait
|
90b5174256
|
minor fix
|
2014-12-15 11:48:43 +05:30 |
|
Pratik Vyas
|
bffad26226
|
Merge branch 'develop'
|
2014-12-12 16:52:09 +05:30 |
|
Pratik Vyas
|
a578f3e23a
|
bumped to version 4.13.1
|
2014-12-12 17:22:09 +06:00 |
|
Nabin Hait
|
870dd43268
|
Merge pull request #2489 from nabinhait/fix1
Pull all customer's po no in delivery note when made from multiple SO
|
2014-12-12 12:50:41 +05:30 |
|
Nabin Hait
|
ad0bd4ca92
|
Pull all customer's po no in delivery note when made from multiple sales order
|
2014-12-12 12:49:45 +05:30 |
|
Nabin Hait
|
eba480e15a
|
Merge pull request #2487 from nabinhait/fix1
Fixed bom patch
|
2014-12-12 11:29:49 +05:30 |
|
Nabin Hait
|
4b83403a63
|
Fixed bom patch
|
2014-12-12 11:28:58 +05:30 |
|
Nabin Hait
|
22c9e42f4d
|
Merge pull request #2482 from neilLasrado/fix-cost
Fixed cost calculation Error
|
2014-12-11 17:36:49 +05:30 |
|
Neil Trini Lasrado
|
6ddc487fb6
|
patch fix
|
2014-12-11 17:33:41 +05:30 |
|
Neil Trini Lasrado
|
3a34cadcb2
|
Fix - Total Fixed Cost with patch
|
2014-12-11 17:15:12 +05:30 |
|
Nabin Hait
|
b71d1a4c7f
|
Merge pull request #2486 from nabinhait/fix1
Removed gross profit field from sales invoice
|
2014-12-11 17:14:26 +05:30 |
|
Nabin Hait
|
bef80bab0d
|
Removed gross profit field from sales invoice
|
2014-12-11 16:27:18 +05:30 |
|
Nabin Hait
|
190210394c
|
Merge pull request #2484 from nabinhait/fix1
Leave application fix
|
2014-12-11 00:02:38 +05:30 |
|
Nabin Hait
|
5cafcf66b0
|
Leave application fix
|
2014-12-10 23:59:04 +05:30 |
|
Nabin Hait
|
d71e50c9fc
|
Merge pull request #2480 from nabinhait/fix1
Fixes for discount amount
|
2014-12-10 12:44:56 +05:30 |
|
Nabin Hait
|
35ebe1bf78
|
Tax amount in POS invoice print format
|
2014-12-10 12:42:32 +05:30 |
|
Nabin Hait
|
b14cc0417d
|
Display tax amount after discount, if there is any discount amount
|
2014-12-10 12:28:25 +05:30 |
|
Pratik Vyas
|
399a3097e8
|
Merge branch 'develop'
|
2014-12-09 16:40:28 +05:30 |
|
Pratik Vyas
|
c8f5c3cdbe
|
bumped to version 4.13.0
|
2014-12-09 17:10:28 +06:00 |
|
Nabin Hait
|
e83d506319
|
Merge pull request #2474 from nabinhait/fix1
Added leave approver name field in leave application
|
2014-12-09 16:37:40 +05:30 |
|
Nabin Hait
|
690bcd7b66
|
Added leave approver name field in leave application
|
2014-12-09 16:36:33 +05:30 |
|
Nabin Hait
|
f18d285eab
|
Merge pull request #2473 from nabinhait/fix1
minor fix
|
2014-12-09 16:31:03 +05:30 |
|
Nabin Hait
|
7887ccb441
|
Credit days fix
|
2014-12-09 14:34:14 +05:30 |
|
Nabin Hait
|
d57b57a21d
|
Minor fix in accounts receivable report
|
2014-12-09 11:56:13 +05:30 |
|
Nabin Hait
|
5cc0531d27
|
Merge pull request #2451 from revant/develop
"From time" cannot be later than "To time" and hours cannot be negative
|
2014-12-02 14:27:00 +05:30 |
|
Revant Nandgaonkar
|
0e5cdc8495
|
Merge branch 'develop' of https://github.com/revant/erpnext into develop
|
2014-12-02 14:21:15 +05:30 |
|
Revant Nandgaonkar
|
b80d892eab
|
removed unecessary backslash
|
2014-12-02 14:19:29 +05:30 |
|
Revant Nandgaonkar
|
185af03fb2
|
Update time_log.py
|
2014-12-02 14:18:10 +05:30 |
|
Nabin Hait
|
abcbbc63d8
|
Merge pull request #2435 from nabinhait/fix1
Fixes in authorization rule based on average discount
|
2014-12-02 10:36:25 +05:30 |
|
Nabin Hait
|
6871c74ce1
|
Merge pull request #2444 from ankitjavalkarwork/contactmob
Display mobile no. of contact
|
2014-12-02 10:35:46 +05:30 |
|
Revant Nandgaonkar
|
d0a44ca85c
|
Changed contact_date to Datetime so appointment or call with time can be scheduled
|
2014-12-01 23:31:53 +05:30 |
|
Revant Nandgaonkar
|
83db3e3ddb
|
"From time" cannot be later than "To time" and hours cannot be negative
|
2014-12-01 16:53:29 +05:30 |
|
Nabin Hait
|
cc11045fd3
|
minor fix
|
2014-11-28 16:59:32 +05:30 |
|
Nabin Hait
|
1b5afe737f
|
Fixes in authorization rule based on average discount
|
2014-11-28 16:59:32 +05:30 |
|
Rushabh Mehta
|
3d65d9602e
|
[error-reports]
|
2014-11-28 14:58:43 +05:30 |
|
ankitjavalkarwork
|
9440d080d4
|
Print Hide Recurring Order/Invoice based fields
|
2014-11-27 17:28:53 +05:30 |
|
ankitjavalkarwork
|
9269c86339
|
Display mobile no of contact
|
2014-11-27 17:13:36 +05:30 |
|
Pratik Vyas
|
7c82d616c9
|
Merge branch 'develop'
|
2014-11-25 11:16:33 +05:30 |
|
Pratik Vyas
|
f227379d2f
|
bumped to version 4.12.0
|
2014-11-25 11:46:33 +06:00 |
|
Nabin Hait
|
eba88919c1
|
Merge pull request #2431 from mayur-patel/patch-2
Update leave_application.py : Modified get_holidays function
|
2014-11-25 10:55:11 +05:30 |
|
Rushabh Mehta
|
3408432b50
|
Merge pull request #2428 from rmehta/translations-update
[translations] updated via frappe.io/translator
|
2014-11-25 10:54:36 +05:30 |
|
Rushabh Mehta
|
a0949158b7
|
[translations] updated via frappe.io/translator
|
2014-11-25 10:53:12 +05:30 |
|
Nabin Hait
|
ea91d2aaf1
|
Merge pull request #2429 from ankitjavalkarwork/expclaimname
Add configurable naming series to Expense claim
|
2014-11-25 10:51:03 +05:30 |
|
Rushabh Mehta
|
de992abf83
|
Merge pull request #2413 from Delte/patch-1
Update tr.csv
|
2014-11-25 10:49:51 +05:30 |
|
Mayur Patel
|
5d8635a8dc
|
Update leave_application.py
See issue #2422 for more detail.
|
2014-11-24 16:57:53 +00:00 |
|
ankitjavalkarwork
|
7e911bae95
|
Add configurable naming series to Expense claim
|
2014-11-24 18:26:17 +05:30 |
|
Nabin Hait
|
0676cf6d3f
|
Merge pull request #2430 from nabinhait/fix1
Multiple minor fixes
|
2014-11-24 18:21:37 +05:30 |
|
Nabin Hait
|
b74ae7aa31
|
Minor fix for order to invoice mapping
|
2014-11-24 18:17:01 +05:30 |
|
Nabin Hait
|
0ad7db3bbd
|
Minor fix in salary slip net total calculation
|
2014-11-24 15:25:13 +05:30 |
|
Nabin Hait
|
db74e316d2
|
Validate serial no after auto-creation based on naming series
|
2014-11-24 15:25:13 +05:30 |
|