Commit Graph

14963 Commits

Author SHA1 Message Date
Neil Trini Lasrado
0b1d7c032a Update manufacturing-settings.md 2016-05-11 16:47:55 +05:30
Rushabh Mehta
d42167e0e5 [cleanup] remove Features Setup 2016-05-11 16:47:14 +05:30
Rushabh Mehta
2dd0581134 [added] domainify.py 2016-05-11 15:14:15 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
f2f15629ab Merge branch 'hotfix' 2016-05-11 12:43:39 +05:30
Nabin Hait
a1fcded0ba bumped to version 6.27.17 2016-05-11 13:13:39 +06:00
Nabin Hait
719504a0fe Merge pull request #5325 from nabinhait/return_fix_2
In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate
2016-05-11 12:38:58 +05:30
Nabin Hait
1997350364 [fix] Divisional loss in purchase receipt 2016-05-11 12:06:29 +05:30
Rushabh Mehta
3edc453506 Merge pull request #5330 from IAGAdmin/patch-2
Update concepts-and-terms.md
2016-05-11 10:54:25 +05:30
IAGAdmin
63b33d0478 Update concepts-and-terms.md 2016-05-11 09:43:10 +08:00
Rushabh Mehta
d95b4a5c5b [minor] added beta for homepage 2016-05-10 17:46:28 +05:30
Anand Doshi
a3f20ae9e6 Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup
Shopping Cart error messages issue resolved
2016-05-10 17:35:02 +05:30
Kanchan Chauhan
1d79f350bc Shopping Cart error messages issue resolved 2016-05-10 17:19:47 +05:30
Nabin Hait
9b5a049fff Merge pull request #5327 from nabinhait/pp_tool
[fix] Create Material Requests for All Required Qty via Production Planning Tool
2016-05-10 17:18:38 +05:30
Nabin Hait
2f88c67a94 Merge pull request #5328 from nabinhait/sales_register_cols
Mode of Payment columns and filters added in sales/purchase register
2016-05-10 17:17:44 +05:30
Nabin Hait
3323d06be0 Mode of Payment columns and filters added in sales/purchase register 2016-05-10 13:17:02 +05:30
Nabin Hait
43d75448ea [fix] Create Material Requests for All Required Qty via Production Plannign Tool 2016-05-10 12:57:24 +05:30
Rushabh Mehta
acf45f7b72 Merge pull request #5294 from rohitwaghchaure/pos
[WIP][Enhancement] Online and Offline POS
2016-05-10 11:25:20 +05:30
Rohit Waghchaure
6087fe178e [Enhancement] POS 2016-05-09 23:36:15 +05:30
Nabin Hait
a9c4c8fc31 In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate 2016-05-09 17:34:47 +05:30
Anand Doshi
e00a20d99d Merge pull request #5284 from kickapoo/develop
Add (optional) Country field to Buying.Supplier DocType (fixes #5223)
2016-05-09 16:58:30 +05:30
Anand Doshi
969863541d Merge pull request #5323 from KanchanChauhan/shoppingcart-changes
Shopping cart dropdown changes
2016-05-09 16:57:08 +05:30
Anand Doshi
c2ade3d34f Merge pull request #5298 from neilLasrado/sal-slip
Moved email salary slip to employee under HR Settings
2016-05-09 16:56:51 +05:30
Neil Trini Lasrado
b2b0b37cc1 Added reference_doctype and reference_name to link Bulk Email to Salary Slip 2016-05-09 13:24:31 +05:30
Kanchan Chauhan
b3573a881e Shopping cart dropdown changes 2016-05-09 12:30:58 +05:30
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
Nabin Hait
80c02640a1 Merge branch 'hotfix' 2016-05-06 16:13:34 +05:30
Nabin Hait
42800d24cc bumped to version 6.27.16 2016-05-06 16:43:34 +06:00
Nabin Hait
845a980a79 Merge pull request #5320 from nabinhait/return_fix_1
[fix] In purchase return entry, consider outgoing rate for serialized items
2016-05-06 16:09:55 +05:30
Anand Doshi
b35abf1125 Merge pull request #5316 from vjFaLk/patch-4
Minor link fix
2016-05-06 15:51:22 +05:30
Nabin Hait
397805f992 Merge pull request #5319 from nabinhait/return_fix
[fix] Validate returned serial nos and batch nos with original document
2016-05-06 15:49:18 +05:30
Nabin Hait
e67c1cdf12 [fix] In purchase return entry, consider outgoing rate for serialized items 2016-05-06 15:46:31 +05:30
Nabin Hait
8704bead49 [fix] Validate returned serial nos and batch nos with original document 2016-05-06 15:30:10 +05:30
Valmik
5fb86ce570 Minor link fix 2016-05-06 12:06:40 +05:30
Nabin Hait
09fec7a15e Merge pull request #5313 from shreyasp/support-week-hotfix
[Hotfixes] Payment tool and Leave Allocation Tool
2016-05-05 16:44:40 +05:30
shreyas
c2a49211a5 [Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers' 2016-05-05 15:56:48 +05:30
shreyas
55cbd52200 [Fix] Allocate leaves only to active employees 2016-05-05 15:16:39 +05:30
shreyas
622fe3f1e3 [Fix] Fetch due date for Sales/Purchase invoice in payment tool 2016-05-05 15:11:04 +05:30
Anand Doshi
c3213b198c Merge pull request #5312 from vjFaLk/leave-app-fix
Fixed Leave Approver issue
2016-05-05 14:39:42 +05:30
Valmik Jangla
a0b9c4cdeb Fixed Leave Application issue 2016-05-05 01:20:47 -07:00
Anand Doshi
b114f73cfe Merge pull request #5299 from vjFaLk/alert-docs
Updated Email Alert docs
2016-05-04 16:14:28 +05:30
Anand Doshi
a110a06f38 Merge pull request #5300 from neilLasrado/hotfix
redirect issues of erpnext to erpnext repository
2016-05-04 15:49:10 +05:30
Neil Trini Lasrado
728d01945c redirect issues of erpnext to erpnext repository 2016-05-02 18:37:47 +05:30
Valmik Jangla
f3c203ba2c Updated Email Alert docs 2016-05-02 18:24:17 +05:30
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover
New look to the website
2016-05-02 15:54:41 +05:30
Nabin Hait
f3bff49799 Merge branch 'master' into develop 2016-05-02 15:19:17 +05:30
Nabin Hait
9b6198436b Merge branch 'hotfix' 2016-05-02 15:19:16 +05:30
Nabin Hait
d824fbbddd bumped to version 6.27.15 2016-05-02 15:49:16 +06:00
Nabin Hait
2460becc50 Merge pull request #5297 from vjFaLk/reset-values
Reset Values in Tools
2016-05-02 15:16:28 +05:30
Rushabh Mehta
360b05f0f5 [enhancement] activity summary in projects 2016-05-02 14:13:38 +05:30