Commit Graph

10609 Commits

Author SHA1 Message Date
Nabin Hait
07722b835c Merge pull request #2495 from nabinhait/fix1
Translation fixes
2014-12-15 15:00:12 +05:30
Nabin Hait
3cd7a45c1b Translation fixes 2014-12-15 14:56:58 +05:30
Nabin Hait
b2a84c7cd9 modified date updated in supplier.json 2014-12-15 14:22:14 +05:30
Nabin Hait
606af96c9f minor fix 2014-12-15 11:57:19 +05:30
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
Neil Trini Lasrado
1d66b71464 patch fix 2014-12-12 14:48:30 +05:30
Neil Trini Lasrado
e1f21682fb changes made 2014-12-12 13:09:42 +05:30
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
Neil Trini Lasrado
cc73999497 validate fixed 2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
f13c4f0145 New feature for issue #2419 2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
8d34417c44 Bom currency feilds changed to type currency and company feild added to BOM 2014-12-12 11:33:50 +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
a94478a618 Merge pull request #2390 from ankitjavalkarwork/fix2314
Add selectable BOM field for Subcontracted Item
2014-12-11 17:41:45 +05:30
Nabin Hait
abfc72ded4 Merge pull request #2450 from ankitjavalkarwork/fix2363
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-11 17:40:54 +05:30
Nabin Hait
4f7c51d68e Merge pull request #2442 from ankitjavalkarwork/gross-profit
Gross profit
2014-12-11 17:37:54 +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
Nabin Hait
a870d540b5 Merge pull request #2458 from neilLasrado/bom-redesign
BOM doctype design modified. Quality feild moved from 'More Section' to ...
2014-12-11 17:25:58 +05:30
Nabin Hait
1656839c1b Merge pull request #2459 from neilLasrado/PO-status-indicator
Fix for "Stopped" status indicator in Purchase Order List View
2014-12-11 17:25:22 +05:30
Nabin Hait
df60e0282e Merge pull request #2475 from neilLasrado/sales-invoice
sales Invoice- filter added for debit to
2014-12-11 17:16:08 +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
Neil Trini Lasrado
c0063a6e74 sales Invoice- filter added for debit to 2014-12-09 17:03:13 +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
erp
9fc0a8cbf8 first is translation commit 2014-12-05 11:17:44 +00:00
ankitjavalkarwork
5edae0e47b [#2314] Add selectable BOM field for Subcontracted Item 2014-12-04 15:54:54 +05:30
Neil Trini Lasrado
355dfe52ab Fix for "Stopped" status indicator in Purchase Order List View
Issue #2368
2014-12-04 13:34:27 +05:30
ankitjavalkarwork
35db282765 Fix gross_profit.py, commonify and add elementwise grouping to report 2014-12-04 13:08:42 +05:30
Neil Trini Lasrado
c73f4f70e4 BOM doctype design modified. Quality feild moved from 'More Section' to 'Materials Section'
[fix] Issue #2404
2014-12-04 12:42:23 +05:30
Rushabh Mehta
ec9db4b799 [report] gross profit WIP 2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9 [report] gross profit WIP 2014-12-04 12:37:39 +05:30
Rushabh Mehta
9f32a50379 [merge] fix 2014-12-03 12:35:19 +05:30
ankitjavalkarwork
c41a0e2e38 Add print formats for Acc. Receivable/Payable and Summary reports 2014-12-02 15:13:36 +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