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

14504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saurabh
0f063a5f46 [patch] map customer_address to shipping_address and customer_address_display to shipping_address_display 2016-03-16 16:23:30 +05:30
Saurabh
14d646f636 [fixes] shipping address on purchase flow 2016-03-16 16:23:30 +05:30
shreyas
7e2d7e88a6 [Partial]Some more changes to enable shipping address to be displayed in PO 2016-03-16 16:23:30 +05:30
shreyas
26bb6f37bc [Partial] Fix to add Shipping address in Purchase order 2016-03-16 16:23:29 +05:30
shreyas
77d23824df [Partial]Some more changes to enable shipping address to be displayed in PO 2016-03-16 16:23:29 +05:30
shreyas
22d26a1d82 [Partial] Fix to add Shipping address in Purchase order 2016-03-16 16:23:29 +05:30
Nabin Hait
91a69e4a8d Merge pull request #4992 from neilLasrado/project-rename 
Fixed bug while selecting project in sales_invoice, sales_order, deli…
 2016-03-16 16:03:18 +05:30
Neil Trini Lasrado
f433a5a124 Fixed bug while selecting project in sales_invoice, sales_order, delivery_note 2016-03-16 16:00:27 +05:30
Nabin Hait
2a5c1138a0 Merge pull request #4944 from rmehta/modules-redesign 
[redesign] modules
 2016-03-16 14:35:11 +05:30
Nabin Hait
fc827b329e Merge pull request #4932 from ci2014/patch-2 
Update purchase-return.md
 2016-03-16 12:33:33 +05:30
Nabin Hait
1f11b96533 Merge pull request #4931 from ci2014/patch-1 
Update sales-return.md
 2016-03-16 12:32:42 +05:30
Nabin Hait
a61930e7a7 [fix] reload doctype forcefully to rename project field 2016-03-16 12:29:32 +05:30
Nabin Hait
22d4a7e742 Merge branch 'prod-order' of https://github.com/neilLasrado/erpnext into neilLasrado-prod-order 2016-03-16 12:18:01 +05:30
Nabin Hait
df4deba515 minor fix 2016-03-16 11:16:31 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Nabin Hait
2c70238fbb Merge branch 'develop' 2016-03-15 16:43:05 +05:30
Nabin Hait
d0723f8a96 bumped to version 6.26.0 2016-03-15 17:13:05 +06:00
Nabin Hait
2ecf239925 [change-log] 2016-03-15 16:26:36 +05:30
Nabin Hait
29b01226ea [translations] 2016-03-15 16:17:21 +05:30
Nabin Hait
6c88331101 Merge pull request #4986 from nabinhait/ar_fix 
Fixes in AR/AP Print Format
 2016-03-15 16:11:06 +05:30
Nabin Hait
f853a92676 Fixes in AR/AP Print Format 2016-03-15 16:10:15 +05:30
Nabin Hait
d8d6579003 Merge pull request #4985 from nabinhait/minor_fixes 
minot fixes
 2016-03-15 15:22:34 +05:30
Nabin Hait
89301863e5 minot fixes 2016-03-15 15:20:49 +05:30
Nabin Hait
6c3cc3647b Merge pull request #4969 from rmehta/link-count 
[enhancement] sort links on basis of link_count (idx)
 2016-03-15 11:40:18 +05:30
Nabin Hait
b9126317b3 Merge pull request #4981 from umairsy/march1 
updated manual
 2016-03-15 11:39:29 +05:30
Nabin Hait
25716652b7 Merge pull request #4982 from rohitwaghchaure/support_week_14_03-1 
[fixes]draft BOM showing in Material Request
 2016-03-15 11:36:15 +05:30
rohitwaghchaure
986616f8ee [fixes]draft BOM showing in Material Request 2016-03-14 19:33:30 +05:30
Umair Sayyed
d3ed3638cf updated manual 2016-03-14 19:28:53 +05:30
Nabin Hait
5fc9552d29 Merge pull request #4980 from rohitwaghchaure/support_week_14_03 
[fixes]Unable set recurring date in sales order
 2016-03-14 19:20:13 +05:30
Nabin Hait
b1f0a7d52e Merge pull request #4876 from saurabh6790/valuation_rate_on_so 
[enhancement] get valuation rate and gross profit on sales order item
 2016-03-14 19:18:58 +05:30
rohitwaghchaure
c54b805981 [fixes]Unable set recurring date in sales order 2016-03-14 19:03:22 +05:30
Nabin Hait
a098b4178a Merge pull request #4976 from saurabh6790/pr_from_si 
[fixes] set amount in PR by checking party_account_currency field
 2016-03-14 19:01:07 +05:30
Nabin Hait
c2f973b521 Merge pull request #4977 from nabinhait/fix88 
[fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000
 2016-03-14 19:00:42 +05:30
Anand Doshi
ad61a28730 [fix] [hot] compact print: check in_format_data for print format builder prints 2016-03-14 18:20:48 +05:30
Nabin Hait
e66b6ce01f Merge pull request #4978 from rohitwaghchaure/support_week_14_03 
[fixes]indicator in material request item
 2016-03-14 18:09:58 +05:30
rohitwaghchaure
bea7558908 [fixes]indicator in material request item 2016-03-14 17:47:36 +05:30
Nabin Hait
aa7e17cd80 Merge pull request #4970 from nabinhait/fix77 
[fix] delete company transactions
 2016-03-14 16:36:51 +05:30
Saurabh
c54619570a [fixes] check party_account_currency while creating Pull Request from Sales Invoice 2016-03-14 15:55:23 +05:30
Nabin Hait
d1f85c4fe6 [fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000 2016-03-14 14:59:21 +05:30
Saurabh
9f94266892 [fixes] fetch value from grand total field while creating payment request from si 2016-03-14 11:23:03 +05:30
Anand Doshi
01a8473996 [fix] [docs] removed contents.md 2016-03-12 00:08:38 +05:30
Anand Doshi
f319206d22 [fix] [hot] reload doctype Holiday List 2016-03-11 19:45:28 +05:30
Nabin Hait
653f68d2e4 [fix] delete company transactions 2016-03-11 17:36:57 +05:30
Anand Doshi
a7aa2c70b5 Merge branch 'vjFaLk-holiday-list' into develop 2016-03-11 17:16:37 +05:30
Anand Doshi
4284fcf2a6 [fix] additional fixes for removal of Fiscal Year form Holiday List 2016-03-11 17:16:30 +05:30
ci2014
73db44d0b9 Update purchase-return.md 
Added back {next}
 2016-03-11 11:27:17 +01:00
Valmik Jangla
e2b8af16ed Fixed Salary Slip to work with new Holiday List 2016-03-11 14:58:55 +05:30
Valmik Jangla
ba54a43e32 Fixed Maintenance Schedule to work wit new Holiday List 
Improved code in Holiday List for speed
 2016-03-11 14:58:55 +05:30
Valmik Jangla
3427c939bd Removed unused code 2016-03-11 14:58:55 +05:30
Valmik Jangla
c666030f34 Get Weekly Off dates now gets dates dynamically 
Fixed Holiday List test records
 2016-03-11 14:58:55 +05:30