Commit Graph

7016 Commits

Author SHA1 Message Date
Rushabh Mehta
5dfd1d48fa [minor] disabled in terms and conditions, fixes #4602 2016-01-12 10:29:29 +05:30
Umair Sayyed
c9af48af35 [docs] added articles in manufacturing, stock, website 2016-01-11 18:35:28 +05:30
Anand Doshi
d8ac0f3df7 [fix] removed duplicate 'region' section as it is already in Frappe Framework 2016-01-11 18:22:02 +05:30
Nabin Hait
af2bf7541f Merge pull request #4603 from ccfiel/develop
note added equity
2016-01-11 13:13:15 +05:30
Chris Ian Fiel
d070d56f72 note added equity 2016-01-11 15:34:24 +08:00
Anand Doshi
cc5632a99c [minor] removed image_view from in list view 2016-01-11 13:03:14 +05:30
Rushabh Mehta
7be0b47778 [minor] [fix] validate fiscal year in trial balance 2016-01-11 11:59:08 +05:30
Rushabh Mehta
5facb60bbe [fix] cleanup old style js in email digest 2016-01-11 10:37:20 +05:30
Raul Viveros
1d5f8d4436 fix button "Edit" encode url in address and contact template 2016-01-09 22:18:14 +01:00
Anand Doshi
74dfabbe21 bumped to version 6.16.4 2016-01-07 18:57:21 +06:00
Anand Doshi
4096603656 [fix] add index on so_detail in Delivery Note Item 2016-01-07 17:10:09 +05:30
Anand Doshi
0eee6bbf7e bumped to version 6.16.3 2016-01-06 19:26:03 +06:00
Anand Doshi
ed72a28e41 [minor] patch for billed in DN and PR 2016-01-06 18:53:12 +05:30
Anand Doshi
4e0908d055 [change-log] 2016-01-06 18:23:25 +05:30
Anand Doshi
3c2ffde95b Merge pull request #4573 from anandpdoshi/fix/stock-entry-calculate-amount-in-js
[fix] Stock Entry: calculate amount in javascript
2016-01-06 18:04:53 +05:30
Anand Doshi
2c021dcdcd [fix] Stock Entry: calculate amount in javascript 2016-01-06 17:47:39 +05:30
Rushabh Mehta
1ee5ae1e25 [fix] [minor] don't show cancelled sales orders 2016-01-06 16:47:18 +05:30
Anand Doshi
0aadb9e213 Merge pull request #4584 from nabinhait/last_pur_rate
Get last purchase rate button in Purchase Order
2016-01-06 16:33:07 +05:30
Anand Doshi
6b71ef5843 [refactor] changed set_modified, change_modified to update_modified like in the framework 2016-01-06 16:32:06 +05:30
Nabin Hait
602683fdc0 Get last purchase rate button in Purchase Order 2016-01-06 16:03:58 +05:30
Nabin Hait
1eea26fc5c [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
c040075bd4 [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
a2afb16f6b [testcase] Billing status in Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
bdab0eea0f Billing status in Purchase Receipt 2016-01-06 15:42:43 +05:30
Nabin Hait
ba5d6b5004 [test-case] for billing status in DN 2016-01-06 15:42:27 +05:30
Nabin Hait
5b13b99441 Update billing status in Delivery Note if directly invoiced against SO 2016-01-06 15:42:27 +05:30
Umair Sayyed
31e2a709d5 updated articles in Accounts 2016-01-06 15:06:11 +05:30
Umair Sayyed
e083cde3d7 updated articles 2016-01-06 15:05:31 +05:30
Anand Doshi
09fc4a456e Merge pull request #4582 from nabinhait/develop
Chart of accounts added for Singapore and some other fixes
2016-01-06 15:01:49 +05:30
Anand Doshi
4774c41958 [fix] validate_multi_currency 2016-01-06 14:16:10 +05:30
Anand Doshi
03e7e581d8 [minor] removed Communication table 2016-01-06 13:23:45 +05:30
Anand Doshi
e88ffe032e [fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked 2016-01-06 12:54:59 +05:30
Nabin Hait
ea8bc8ecb0 Chart of accounts added for Singapore and some other fixes 2016-01-06 12:32:48 +05:30
Anand Doshi
a40c6282a1 [fix] don't allow import for child tables 2016-01-06 12:20:25 +05:30
Anand Doshi
2076203fc1 bumped to version 6.16.2 2016-01-05 19:39:35 +06:00
Anand Doshi
d7b7f74ac9 [docs] 2016-01-05 19:08:09 +05:30
Anand Doshi
d27308d1cd Merge pull request #4575 from nabinhait/report_fix_1
[fix] minor fix in stock projected qty
2016-01-05 18:41:48 +05:30
Anand Doshi
06a82d4e1f Merge pull request #4574 from rmehta/translations
Translation fixes
2016-01-05 18:41:18 +05:30
Anand Doshi
f9eff57531 [fix] credit limit 2016-01-05 16:00:33 +05:30
Rushabh Mehta
e64fbd6d3c [minor] fixes for chart_of_accounts_builder app 2016-01-04 18:11:21 +05:30
Anand Doshi
988a1ab419 bumped to version 6.16.1 2016-01-04 18:28:13 +06:00
Anand Doshi
13bf123b24 [hotfix] item on web 2016-01-04 17:51:35 +05:30
Anand Doshi
10be112e85 bumped to version 6.16.0 2016-01-04 17:25:20 +06:00
Anand Doshi
bb256e41d7 [translations] 2016-01-04 16:51:24 +05:30
Nabin Hait
d35d74346d [fix] minor fix in stock projected qty 2016-01-04 16:16:49 +05:30
Rushabh Mehta
969d48a554 [translations] fixes #4534-38 2016-01-04 16:09:40 +05:30
Anand Doshi
d8b15ebaf7 Merge pull request #4572 from nabinhait/multi-currency-docs
[fix] Updated multi currency docs
2016-01-04 16:06:02 +05:30
Anand Doshi
b55dd5b284 [fix] BOM validate quantity > 0 2016-01-04 16:02:04 +05:30
Rushabh Mehta
5760b79747 [translations] fixes #4533 2016-01-04 15:57:01 +05:30
Rushabh Mehta
eb961370ff [translations] fixes #4532 2016-01-04 15:48:37 +05:30
Nabin Hait
cb08d576f6 Merge pull request #4571 from anandpdoshi/fix/payment-reconciliation-date
[fix] Payment Reconciliation: use the date and amount filters only for Invoice
2016-01-04 15:24:10 +05:30
Nabin Hait
9f40a252fc [fix] Updated multi currency docs 2016-01-04 15:20:37 +05:30
Anand Doshi
aee8b5bcad [fix] Purchase Receipt: Show row no. against the Rejected Warehouse mandatory error 2016-01-04 13:16:09 +05:30
Anand Doshi
f7980927a1 [fix] Payment Reconciliation: use the date and amount filters only for Invoice 2016-01-04 13:00:14 +05:30
Anand Doshi
c1e1026486 [fix] validate 'cannot change fiscal year dates' only if not new 2016-01-04 12:20:25 +05:30
Anand Doshi
7ae53657f9 Merge pull request #4565 from nabinhait/leave_docs
[docs] Leave Management
2016-01-04 12:11:00 +05:30
Rushabh Mehta
51008f2abc [cleanup] [website] 2016-01-01 17:24:37 +05:30
Nabin Hait
c1e5cbb55d [docs] Leave Management 2016-01-01 17:08:57 +05:30
Nabin Hait
2d0ef63e72 bumped to version 6.15.1 2015-12-31 16:44:17 +06:00
Nabin Hait
884d4cbc48 Merge pull request #4560 from nabinhait/item_variants
[fix] Disable atrribute table in variant item record
2015-12-31 15:58:41 +05:30
Nabin Hait
51ff2658cb [fix] Minor changes in item naming 2015-12-31 15:49:00 +05:30
Nabin Hait
dd1c3ba164 Merge branch 'develop' of https://github.com/gabtzi/erpnext into gabtzi-develop 2015-12-31 15:46:15 +05:30
Nabin Hait
6b068e1367 [fix] Disable atrribute table in variant item record 2015-12-31 15:44:12 +05:30
Nabin Hait
b9dcf7f857 Merge pull request #4554 from umairsy/develop
Updated Articles
2015-12-31 15:37:46 +05:30
Nabin Hait
9ebbec5d9a Merge pull request #4558 from nabinhait/item_variants
[fix] Disable atrribute table in variant item record
2015-12-31 15:18:06 +05:30
Nabin Hait
bb9f59a051 Merge pull request #4556 from nabinhait/setup_bank
[fix] Create bank accounts from setup wizard #4546
2015-12-31 15:17:51 +05:30
Nabin Hait
f8de94b7c6 Merge pull request #4557 from nabinhait/po_fix
[fix] Update ordered qty in SO, if PO is made against SO
2015-12-31 15:17:41 +05:30
Nabin Hait
6626e32719 [fix] Disable atrribute table in variant item record 2015-12-31 14:54:57 +05:30
Rushabh Mehta
d55bdcf921 [fix] before_install returns False if setup wizard has been completed, fixes frappe/frappe#1488 2015-12-31 11:12:48 +05:30
Umair Sayyed
40a79de34d updating articles under Accounts 2015-12-30 18:27:08 +05:30
Nabin Hait
82a1561120 [fix] Create bank accounts from setup wizard #4546 2015-12-30 15:32:57 +05:30
Nabin Hait
3505de037e [fix] Update ordered qty in SO, if PO is made against SO 2015-12-30 15:03:34 +05:30
Umair Sayyed
d548ef8158 updated Articles in Customization and Accounting section 2015-12-29 16:25:26 +05:30
Umair Sayyed
3ad37363ed update artciles in customization section 2015-12-28 17:24:51 +05:30
gabtzi
d46abb49f3 Fix for Issue #4543: Suffix now uses attribute abbreviation if it exists or value for numeric attributes 2015-12-28 12:03:24 +02:00
Nabin Hait
8efeea9c59 bumped to version 6.15.0 2015-12-28 15:39:43 +06:00
Nabin Hait
bf9e8cfbcc [translations] 2015-12-28 14:38:22 +05:30
gabtzi
096fc88200 Fix for Issue #4543: Improved code to check if it's a variant only once. 2015-12-28 11:07:10 +02:00
Nabin Hait
d5dedb1808 Merge pull request #4548 from nabinhait/fix1
[fix] Ignore permissions while creating fiscal year automatically
2015-12-28 14:23:01 +05:30
Nabin Hait
e50f80302a Merge pull request #4549 from saurabh6790/bin_update
[fixes] flag to identify actual qty update
2015-12-28 14:22:46 +05:30
gabtzi
9d44ac88f2 Fix for Issue #4543: Automatic item_code generation for variants when parent item is named after a Naming Series 2015-12-28 10:26:42 +02:00
Nabin Hait
892a782e59 docs 2015-12-28 13:27:41 +05:30
Saurabh
b166bcf50b [fixes] flag to trigger actual qty update 2015-12-28 13:25:35 +05:30
Nabin Hait
0e2d1bd4ed [fix] Ignore permissions while creating fiscal year automatically 2015-12-28 13:04:19 +05:30
Nabin Hait
f080003415 Merge pull request #4542 from umairsy/develop
updated Articles under Customization section
2015-12-28 12:43:18 +05:30
Nabin Hait
96e7c5a3bd Merge pull request #4541 from neilLasrado/develop
Added education as a domain in Company
2015-12-28 12:42:16 +05:30
Umair Sayyed
4bad150cf0 updated customization related articles 2015-12-24 20:40:37 +05:30
Anand Doshi
76568f0e8e [fix] log newsletter sending error 2015-12-24 15:13:54 +05:30
Neil Trini Lasrado
49febea6f5 Added education as a domain in Company 2015-12-24 15:10:35 +05:30
Rushabh Mehta
a59e1792b5 Merge pull request #4535 from nabinhait/defaults
[fix] Get defaults based on doctype or fieldname
2015-12-24 11:50:08 +05:30
Umair Sayyed
56e19f3a8b updated articles in the setup section 2015-12-23 18:58:07 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Rushabh Mehta
8681a95010 bumped to version 6.14.1 2015-12-23 16:59:34 +06:00
Rushabh Mehta
1f63747916 [minor] [fix] add child in sales browser 2015-12-23 16:23:37 +05:30
Nabin Hait
6f8dafbb5e [fix] Validate advance entry based on party 2015-12-23 13:03:31 +05:30
Rushabh Mehta
d4073d50b2 Merge pull request #4530 from umairsy/develop
Updated screenshots in some articles
2015-12-23 13:01:30 +05:30
Rushabh Mehta
88bcee78a7 Merge pull request #4524 from nabinhait/jv_fix_9
[fix] Set debit/credit in company currency
2015-12-23 12:59:02 +05:30
Rushabh Mehta
cc2796e676 Merge pull request #4520 from partzsch/develop
Time Log now down to seconds
2015-12-23 12:56:44 +05:30
Umair Sayyed
dbaf6b569b Updated screenshots in some articles 2015-12-23 12:11:53 +05:30
Nabin Hait
d37cef7f60 [fix] Set debit/credit in company currency 2015-12-22 15:13:01 +05:30
Rushabh Mehta
01293bb3a3 [fix] [minor] fix available qty even if 0 2015-12-22 12:57:42 +05:30
partzsch
55ad42cfd0 Time Log now down to seconds
according to request of @anadpdoshi
new branch new commit new PR
2015-12-21 17:51:42 +01:00
Anand Doshi
381cec7b87 [fix] added Shopping Cart and Report Builder in Learn module 2015-12-21 18:56:20 +05:30
Anand Doshi
9fdf2a8bfe bumped to version 6.14.0 2015-12-21 19:04:08 +06:00
Anand Doshi
f773f1f539 [videos] added missing videos 2015-12-21 18:32:23 +05:30
Umair Sayyed
e1482f1acc video help page on report builder and shopping cart 2015-12-21 18:06:15 +05:30
Anand Doshi
c98d244af0 [change-log] 2015-12-21 17:31:09 +05:30
Anand Doshi
ee19fc0c7f [translations] + added Gujarati - Fixes frappe/translator#63 2015-12-21 17:10:20 +05:30
Anand Doshi
ee2129ce1c Merge pull request #4513 from nabinhait/discount_percentage
Additional Discount amount based on percentage
2015-12-21 16:13:17 +05:30
Anand Doshi
beed9ae4f8 Merge pull request #4510 from nabinhait/account_merge
[fix] Group account merging with sub-ordinate group
2015-12-21 16:03:19 +05:30
Anand Doshi
50ddf921be [minor] UOM message 2015-12-21 10:58:33 +05:30
Nabin Hait
3769d87240 Additional Discount amount based on percentage 2015-12-18 13:12:08 +05:30
Anand Doshi
0f809426d2 [fix] Validate transfer qty cannot be greater than qty 2015-12-17 22:35:03 +05:30
Nabin Hait
adab5d308c [fix] Group account merging with sub-ordinate group 2015-12-17 12:53:25 +05:30
Nabin Hait
afda26e4f3 Fixed conflict 2015-12-17 12:19:58 +05:30
Chris Ian Fiel
d6d354b5c3 By: nabinhait
Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".
2015-12-17 09:42:12 +08:00
Chris Ian Fiel
7d310bd182 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2015-12-17 09:18:24 +08:00
Nabin Hait
8b33a6cdc0 Cleanup in cash flow 2015-12-16 16:09:43 +05:30
Anand Doshi
5605f8f20e bumped to version 6.13.1 2015-12-16 13:48:40 +06:00
Anand Doshi
a1580f2781 [language] Added Malayalam - Fixes frappe/translator#62 2015-12-16 13:17:24 +05:30
Anand Doshi
dfdededcf0 [fix] product search limit = 12 instead of 10, since we show it in a grid of 12 2015-12-16 12:57:02 +05:30
Giovanni Lion
55cca49371 Changelog file naming issue 2015-12-16 12:29:15 +08:00
Nabin Hait
5e173c7106 Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop 2015-12-15 17:39:55 +05:30
Anand Doshi
a17ddcfe89 bumped to version 6.13.0 2015-12-15 18:03:01 +06:00
Anand Doshi
088826f6f0 [change-log] 2015-12-15 17:28:34 +05:30
Anand Doshi
f89eaa96d1 [docs] Fixed heading and added attribution to 'CWT Connector & Wire Technology GmbH' for german docs 2015-12-15 17:22:15 +05:30
Martin Ender
e526cfe7ec Update concepts-and-terms.md 2015-12-15 17:22:15 +05:30
Martin Ender
21c189184d Update concepts-and-terms.md 2015-12-15 17:22:15 +05:30
Martin Ender
2aaebdbe11 Update concepts-and-terms.md 2015-12-15 17:22:14 +05:30
Martin Ender
cda3174a57 Update concepts-and-terms.md 2015-12-15 17:22:14 +05:30
Martin Ender
91eeb76f7b Update concepts-and-terms.md 2015-12-15 17:22:14 +05:30
Martin Ender
df18c29fb7 Update concepts-and-terms.md 2015-12-15 17:22:14 +05:30
Martin Ender
7aebb39003 Update implementation-strategy.md 2015-12-15 17:22:14 +05:30
Martin Ender
91bb25d0c9 Update implementation-strategy.md 2015-12-15 17:22:14 +05:30
Martin Ender
b89d7eb558 Update implementation-strategy.md 2015-12-15 17:22:14 +05:30
Martin Ender
ba004aab83 Update the-champion.md 2015-12-15 17:22:14 +05:30
Martin Ender
4c3762989b Update the-champion.md 2015-12-15 17:22:14 +05:30
Martin Ender
225b907a03 Update getting-started-with-erpnext.md 2015-12-15 17:22:14 +05:30
Martin Ender
b543861cbe Update getting-started-with-erpnext.md 2015-12-15 17:22:14 +05:30
Martin Ender
fc6595b92b Update getting-started-with-erpnext.md 2015-12-15 17:22:14 +05:30
Martin Ender
d11df3645b Update getting-started-with-erpnext.md 2015-12-15 17:22:13 +05:30
Martin Ender
ea4c83dcb3 Update open-source.md 2015-12-15 17:22:13 +05:30
Martin Ender
3d05635d7a Update open-source.md 2015-12-15 17:22:13 +05:30
Martin Ender
90b0db2d18 Update open-source.md 2015-12-15 17:22:13 +05:30
Martin Ender
91a71d4f2c Update open-source.md 2015-12-15 17:22:13 +05:30
Martin Ender
36ab7f01b4 Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
130dd2da61 Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
6d15d36639 Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
4395d0bc4d Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
6e4e2152af Update print-format.md 2015-12-15 17:22:13 +05:30