Commit Graph

10594 Commits

Author SHA1 Message Date
Nabin Hait
4ec5d5594b Merge pull request #2696 from nabinhait/fix1
net_total and grand_total mismatch issue
2015-02-06 15:43:10 +05:30
Nabin Hait
a3cb828ed3 progress bar in item grid 2015-02-06 13:00:33 +05:30
Anand Doshi
e241569303 Allow non-english characters in Naming Series 2015-02-06 12:56:26 +05:30
Anand Doshi
9b30a8626c [minor] removed default filters for sales order and material request, fixed pos css 2015-02-06 12:30:08 +05:30
Nabin Hait
5e13e0c316 net_total and grand_total mismatch issue 2015-02-05 17:18:03 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Pratik Vyas
bfeb7c4a57 Merge branch 'develop' 2015-02-05 15:44:06 +05:30
Pratik Vyas
43f627a83a bumped to version 4.21.1 2015-02-05 16:14:06 +06:00
Anand Doshi
d0b3a3734e Merge pull request #2693 from anandpdoshi/anand-feb-5
Fixed call to calculate
2015-02-05 15:25:25 +05:30
Nabin Hait
94365fa035 Merge pull request #2694 from nabinhait/fix1
divisional loss adjustment while doing gl entry for purchase receipt
2015-02-05 15:22:28 +05:30
Nabin Hait
e0ce9407cb divisional loss adjustment while doing gl entry for purchase receipt 2015-02-05 15:12:37 +05:30
Anand Doshi
dea3fb0d64 [fix] call calculate code only once after applying pricing rule 2015-02-05 15:06:16 +05:30
Pratik Vyas
1dae1c40b9 Merge branch 'develop' 2015-02-05 14:25:13 +05:30
Pratik Vyas
fd654a06e8 bumped to version 4.21.0 2015-02-05 14:55:13 +06:00
Nabin Hait
5bf1f89da7 Merge pull request #2669 from nathando/patch-2
Look like a minor bug
2015-02-05 13:48:47 +05:30
Nabin Hait
b6c8c7436f Merge pull request #2691 from nabinhait/fix1
item-wise tax distribution if amount entered in actual
2015-02-05 10:31:30 +05:30
Anand Doshi
dd942bb3d2 [minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists 2015-02-04 18:53:24 +05:30
Nabin Hait
1dc8ff5220 item-wise tax distribution if amount entered in actual 2015-02-04 18:06:59 +05:30
Rushabh Mehta
0e13221338 [print] item tables - override description and uom 2015-02-04 17:02:24 +05:30
Neil Trini Lasrado
59a706585c actual start and end date made blank if islocal 2015-02-04 11:44:24 +05:30
Neil Trini Lasrado
de164c91e0 actual start and end date calculation - call moved to submit and cancel of Time Log 2015-02-04 11:35:10 +05:30
Neil Trini Lasrado
2017796de7 fixes in auto create time logs 2015-02-04 11:16:49 +05:30
Neil Trini Lasrado
a9b3ec180e fixes for productiojn order 2015-02-04 11:16:49 +05:30
Rushabh Mehta
b736443e3f [patch] [fix] 2015-02-04 10:40:02 +05:30
Nabin Hait
279bb6f3ed Merge pull request #2628 from neilLasrado/batch-validation
Batch Validation
2015-02-03 18:33:49 +05:30
Nabin Hait
06d81822fd Merge pull request #2673 from nabinhait/fix1
Multiple fixes
2015-02-03 18:32:19 +05:30
Nabin Hait
1f9c6fdcf3 Merge pull request #2605 from neilLasrado/bom-costs
Bom operations and item link removed.
2015-02-03 18:31:56 +05:30
Neil Trini Lasrado
14e24a947b fixes for batch validations 2015-02-03 18:23:46 +05:30
Neil Trini Lasrado
9448aaf2a6 validation added in stock entry 2015-02-03 18:09:56 +05:30
Neil Trini Lasrado
acbf185c1e fixes 2015-02-03 18:07:34 +05:30
Neil Trini Lasrado
c8c67f7807 Bom operations and item link removed. Cost recalculated on removal of operation or rew material row. 2015-02-03 18:07:34 +05:30
Nabin Hait
44c0a741d1 Merge pull request #2672 from neilLasrado/batch-list-view
batch list view fix
2015-02-03 18:01:53 +05:30
Nabin Hait
c0c9023d27 Merge pull request #2653 from neilLasrado/bom-validations
Validations added to Bom Doctype.
2015-02-03 18:01:31 +05:30
Nabin Hait
bdc72e7e8b Merge pull request #2613 from neilLasrado/bom-item-name
item name added to BOM
2015-02-03 18:01:10 +05:30
Nabin Hait
0c883500bb Expense account query in purchase invoice 2015-02-03 17:59:00 +05:30
Nabin Hait
4ce020f521 Item grid header in print format 2015-02-03 17:59:00 +05:30
Rushabh Mehta
c567e8e960 [fix] analytics reports + remove print item tables #2667 2015-02-03 17:56:25 +05:30
Neil Trini Lasrado
75e0f0a153 batch list view fix: 2015-02-03 17:41:11 +05:30
Nabin Hait
11cb9de10a Merge pull request #2670 from nabinhait/fix1
default target warehouse for subcontract
2015-02-03 14:34:34 +05:30
Neil Trini Lasrado
9257baa747 fixes in bom validations 2015-02-03 12:29:36 +05:30
Neil Trini Lasrado
f5be350eb4 Validations added to Bom Doctype. 2015-02-03 12:21:46 +05:30
Neil Trini Lasrado
7dac750ffe patch fix 2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
41acbff959 item name added to BOM 2015-02-03 10:59:40 +05:30
Do Le Bao Nguyen
f9b63dd36a Look like a minor bug
- There is no frappe.get_default but only frappe.db.get_default ?
- Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first
2015-02-03 11:10:09 +08:00
Nabin Hait
282695f536 Merge pull request #2664 from neilLasrado/lead-search
lead report - state, country and pincode seprated from address
2015-02-02 17:07:00 +05:30
Nabin Hait
d2b762d760 Merge pull request #2617 from neilLasrado/sales-order
sales order - allow same item to enter multiple times. Throws warning
2015-02-02 16:44:12 +05:30
Nabin Hait
7e333c6a31 Merge pull request #2596 from neilLasrado/item-in-bom
allow bom field removed from Item Master
2015-02-02 16:33:46 +05:30
Nabin Hait
4b4598e5cb Merge pull request #2594 from neilLasrado/bom-item-update
bom - button added to update item desc.
2015-02-02 16:30:58 +05:30
Neil Trini Lasrado
809abdf295 lead report - state, country and pincode seprated from address 2015-02-02 11:43:56 +05:30
Rushabh Mehta
052bd624c1 [minor] removed company description and don't call apply_price_list if no items 2015-01-30 16:57:24 +05:30