Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,076 Commits 3 Branches 0 Tags 1 GiB
1ade5927c4
Commit Graph

7995 Commits

Author SHA1 Message Date
Neil Trini Lasrado
4668a69cf5 Fixed reports 2016-05-17 19:04:08 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Nabin Hait
a09285122f Added root type for Income. Fixes #5356 2016-05-17 10:37:31 +05:30
Anand Doshi
0d66260d31 [fix] [patch] update home page 2016-05-17 10:21:08 +05:30
Rushabh Mehta
a484ff751b Merge pull request #5353 from MaxMorais/patch-4 
Small improvement in maintenance scheduler
 2016-05-16 14:56:17 +05:30
Maxwell Morais
92b0be93c7 Removed HTML tags from messages 
Remove HTML from messages
 2016-05-16 06:24:55 -03:00
Maxwell Morais
89fdbdf404 Translation improvements 
Translation improvements
 2016-05-16 06:08:51 -03:00
Maxwell Morais
52a66fc90b Reduce start and end date verification 
Given the actual scenario, that verify if the start_date <= end_date, do schedule a Maintenance, 2 days are required, but in many cases only one day is required!
 2016-05-16 06:06:59 -03:00
Maxwell Morais
4e7b52952e Added warning 
Added a warning to show a information to the active user
 2016-05-16 05:38:04 -03:00
Rushabh Mehta
72615977d7 Merge pull request #5337 from rohitwaghchaure/pos 
[WIP] [POS] Some changes and fixes
 2016-05-16 12:06:42 +05:30
Rushabh Mehta
3a87c479c7 Merge pull request #5346 from umairsy/domains 
Domainifying
 2016-05-16 12:02:51 +05:30
Rushabh Mehta
dc997dc426 Merge pull request #5352 from fderyckel/patch-2 
Update multi-currency-accounting.md
 2016-05-16 12:02:23 +05:30
Rushabh Mehta
9f5ff9476e Merge pull request #5342 from rohitwaghchaure/support_week_2 
[Fix] Removed is_pro_applicable
 2016-05-16 12:02:01 +05:30
Rushabh Mehta
d474e0cb5b Merge pull request #5345 from nabinhait/coa 
Changes related for charts builder
 2016-05-16 12:01:32 +05:30
Rohit Waghchaure
e0934d118f [Fixes] Some changes and fixes 2016-05-16 12:01:16 +05:30
Rushabh Mehta
03578620e0 Merge pull request #5338 from fderyckel/patch-1 
Update make-field-visible-in-print-format.md
 2016-05-16 12:00:15 +05:30
Rushabh Mehta
a9e3936b20 Merge pull request #5335 from neilLasrado/patch-1 
Update manufacturing-settings.md
 2016-05-16 11:57:48 +05:30
Rushabh Mehta
6471e178f6 Merge pull request #5321 from rohitwaghchaure/rfq_fixes 
[Fixes] RFQ minor fixes
 2016-05-16 11:57:35 +05:30
Rushabh Mehta
c93caee284 Merge pull request #5265 from ShashaQin/patch-46 
Update opportunity.py
 2016-05-16 11:56:32 +05:30
Rushabh Mehta
02f76dc0f9 [patch] [fix] 2016-05-16 11:46:29 +05:30
Rushabh Mehta
f1bdae4496 [patch] [fix] 2016-05-16 11:41:29 +05:30
Rushabh Mehta
7c96dc1783 [minor] [fix] cart 2016-05-16 11:36:08 +05:30
Maxwell Morais
28453efece Small improvement in maintenance scheduler 
This improvement is intended to start disable blocking Maintenance Schedule submit, when the `Sales Person` does not have a `user_id` in the Employee!

The old logic try to use the `sales_person` email_id or the `owner` to create the event, but due some fails in the code, it dont occurs!
 2016-05-16 00:50:03 -03:00
François
0802c56625 Update multi-currency-accounting.md 2016-05-15 20:21:08 +02:00
Rushabh Mehta
c8b2a9d654 [patch] [fix] 2016-05-15 10:08:52 +05:30
Anand Doshi
a5e4dc85db Merge pull request #5341 from rohitwaghchaure/support_week_1 
[Fix] Warranty claim form, unexpected token illegal error
 2016-05-14 13:16:48 +05:30
Anand Doshi
97a70b226a Merge pull request #5332 from anandpdoshi/fix/validate-account-company 
[fix] Validate Company in Account autoname
 2016-05-14 13:10:42 +05:30
kressi
0179909db2 Merge branch 'develop' into docfix 2016-05-13 15:40:33 +02:00
kressi
472a84ab13 fixed broken links and links to content in different language 2016-05-13 15:22:22 +02:00
Umair Sayyed
e44d1430e1 fixes in domainification. Also reordered some fields in BOM 2016-05-13 18:31:20 +05:30
kressi
28737b6808 fixed formatting and punctuation 2016-05-13 14:37:42 +02:00
Umair Sayyed
90cea14ce3 domanifying EPRNext, fixes #5334 2016-05-13 18:06:17 +05:30
Umair Sayyed
99f7528578 domanifying ERPNext via #5334 2016-05-13 18:06:17 +05:30
Rushabh Mehta
9c6c0d2836 [patch] [fix] 2016-05-13 17:50:33 +05:30
kressi
e7c773310b fixed typos and inconsistencies 2016-05-13 13:20:25 +02:00
Rushabh Mehta
d774f40497 remove print in homepage 2016-05-13 16:21:37 +05:30
Nabin Hait
665568d87e ignore permissions while creating records from charts builder portal 2016-05-13 15:56:11 +05:30
Nabin Hait
a21f49dd94 Tax rate in chart of accounts 2016-05-13 15:56:11 +05:30
Nabin Hait
e4670a9a45 Cleaned up chart of accounts 2016-05-13 15:56:11 +05:30
Michael Kressibucher
c53df03262 fixed typo 2016-05-12 15:14:52 +02:00
Rohit Waghchaure
8904730cd4 [Fix] Removed is_pro_applicable 2016-05-12 18:03:08 +05:30
Rohit Waghchaure
a92560c851 [Fix] Warranty claim form, unexpected token illegal error 2016-05-12 16:30:56 +05:30
Rushabh Mehta
48c7658aee [minor] added set_value in domainify 2016-05-12 16:26:01 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Nabin Hait
825070e504 Merge pull request #5331 from nabinhait/multi-fix-55 
Multiple fixes
 2016-05-12 12:27:42 +05:30
François
d9f7364289 Update make-field-visible-in-print-format.md 
Change a few typo
 2016-05-12 06:32:40 +02:00
Rohit Waghchaure
29c7876e87 [Fixes] RFQ minor fixes 2016-05-11 19:38:29 +05:30
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
Anand Doshi
19fec06366 [fix] Validate Company in Account autoname 2016-05-11 13:27:18 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +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
b3a0e05bae included path fixed in report print formats 2016-05-11 12:38:11 +05:30
Nabin Hait
a1ec7f1eed Add root account 2016-05-11 12:38:11 +05:30
Nabin Hait
1997350364 [fix] Divisional loss in purchase receipt 2016-05-11 12:06:29 +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
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
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
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
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
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
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
d824fbbddd bumped to version 6.27.15 2016-05-02 15:49:16 +06:00
Rushabh Mehta
360b05f0f5 [enhancement] activity summary in projects 2016-05-02 14:13:38 +05:30
Nabin Hait
863cb12426 minor fix 2016-05-02 13:48:27 +05:30
Rushabh Mehta
764aa92da4 [minor] added remember_selected in hooks and doc update 2016-05-02 13:28:59 +05:30
Neil Trini Lasrado
71e93d6691 Added test cased 2016-05-02 12:04:20 +05:30
Neil Trini Lasrado
b14af59d39 Moved send email checkbox from salary slip to a global setting under hr settings 2016-05-02 12:04:19 +05:30
Valmik Jangla
651dc5b345 Reset Values in Tools 2016-05-02 12:00:06 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Nabin Hait
b78adcf279 Merge branch 'master' into develop 2016-04-29 18:26:46 +05:30
Nabin Hait
ab7f6870cb bumped to version 6.27.14 2016-04-29 18:56:45 +06:00
Neil Trini Lasrado
c33b5b74c6 Itemwise purchase and Itemwise sales 2016-04-29 18:21:51 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Rushabh Mehta
127de729b2 [fix] making time log entry easier, to time not mandatory while making time log and Finish button 2016-04-29 14:19:21 +05:30