Agus Syahputra
e24cfdc556
Update overwriting-data-from-data-import-tool.md
2016-02-05 08:27:20 +07:00
Chris Ian Fiel
af667f77e6
Update bank_reconciliation.py
...
set to null if clearance_date is blank because if not it will set it just 0000-00-00.
2016-02-04 22:10:36 +08:00
Nabin Hait
ce4e8ec178
Merge pull request #4737 from ShashaQin/patch-18
...
Gross Profit report improvement
2016-02-04 17:26:20 +05:30
Nabin Hait
4129ae5395
[fix] Translations in Stock balance report
2016-02-04 17:22:57 +05:30
Nabin Hait
92c6c617de
[fix] Remove filters on item group in territory and sales person target settings
2016-02-04 17:22:57 +05:30
Nabin Hait
a731ad4433
[fix] Set party account on chnage of company
2016-02-04 17:22:57 +05:30
Nabin Hait
3110c4a772
[fix] Make bank entry from expense claim
2016-02-04 17:22:57 +05:30
Rushabh Mehta
d50356dbab
[docs] remove /docs/current from repo, they are re-built anyways
2016-02-04 17:10:24 +05:30
Rushabh Mehta
d1ba86a952
Merge branch 'develop' of github.com:frappe/erpnext into develop
2016-02-04 17:09:18 +05:30
ShashaQin
8c63697f41
Update item_wise_purchase_history.json
2016-02-04 16:46:46 +08:00
ShashaQin
e7dccca782
Update item_wise_sales_history.json
2016-02-04 16:44:18 +08:00
Valmik Jangla
8d0ed21c04
Added From and To date to Holiday Report
...
Changed HD to H in Monthly Attendance Report
2016-02-04 12:18:55 +05:30
ShashaQin
bcc56a4557
Update gross_profit.py
...
Gross Profit report improvement
2016-02-04 11:45:00 +08:00
Rushabh Mehta
7bb2f3a27b
[fix] newsletter priority
2016-02-03 16:20:59 +05:30
Nabin Hait
fba61abd2a
bumped to version 6.20.0
2016-02-03 15:53:56 +06:00
Nabin Hait
94bfe8ea0d
[change-log]
2016-02-03 15:14:17 +05:30
Nabin Hait
31619f0a83
[docs]
2016-02-03 15:13:55 +05:30
Nabin Hait
34037e0d88
[translations]
2016-02-03 13:11:06 +05:30
Nabin Hait
647102fc94
Merge pull request #4729 from vjFaLk/doc-update
...
Updated documentation for new features
2016-02-03 13:01:02 +05:30
ShashaQin
995a71c854
Update leave_application.py
...
fix half day leave issue
2016-02-03 13:10:15 +08:00
Nabin Hait
bd7f48cfd4
[report] Financial Statements: Accumulated periodic balance based on filters
2016-02-02 19:05:43 +05:30
Nabin Hait
82cef59fb3
[fix] Purchase Return warehouse validation
2016-02-02 19:05:43 +05:30
ShashaQin
cc6ce5beac
Update financial_statements.py
2016-02-02 19:05:42 +05:30
ShashaQin
15d7224335
Update balance_sheet.py
2016-02-02 19:05:42 +05:30
ShashaQin
1f51e71827
Update profit_and_loss_statement.py
2016-02-02 19:05:42 +05:30
ShashaQin
539a826b37
Update financial_statements.js
...
Adding Accumulated Values check box on Profit and Loss, Balance Sheet
2016-02-02 19:05:42 +05:30
Valmik Jangla
0ec9b90113
Updated documentation
2016-02-02 18:29:09 +05:30
Nabin Hait
49b275ad1d
Merge pull request #4704 from chaoyee/develop
...
Update material_request.py
2016-02-02 16:11:35 +05:30
Nabin Hait
3c55d89f7f
[minor] Reference doctype in Item-wise price List Rate report
2016-02-01 15:55:09 +05:30
Nabin Hait
d5fda57297
[fix] Ignore permissions and made Customer warehouse field hidden in selling cycle
2016-02-01 15:55:09 +05:30
Nabin Hait
a85a1ff145
[fix] Validate rate with reference doc
2016-02-01 15:55:09 +05:30
Nabin Hait
afb8ec9cb6
[fix] Validate company abbr
2016-02-01 15:55:09 +05:30
Nabin Hait
8b92de26f0
Merge pull request #4718 from vjFaLk/holiday-fix
...
Fixed issue where no Holidays would cause the report to break
2016-02-01 15:49:15 +05:30
Nabin Hait
fcd4f2b86b
Merge pull request #4706 from vrms/vrms-patch-1
...
Update implementation-strategy.md
2016-02-01 15:47:57 +05:30
Nabin Hait
1277a61dad
Merge pull request #4720 from agusputra/patch-7
...
Update delete-a-company-and-all-related-transactions.md
2016-02-01 15:47:07 +05:30
ShashaQin
ed11e93b25
Update stock_reconciliation.py
...
exclude 'disabled' item when get items
2016-02-01 16:54:19 +08:00
ShashaQin
1d702bf112
Update stock_reconciliation_item.json
...
Update valuation rate description. This description will be shown on downloaded template in order to input valuation rate correct.
2016-02-01 16:51:01 +08:00
Anand Doshi
43cdf792f9
Merge pull request #4715 from agusputra/patch-6
...
Update stock-reconciliation-for-non-serialized-item.md
2016-02-01 14:17:24 +05:30
Agus Syahputra
e0825aaea9
Update delete-a-company-and-all-related-transactions.md
2016-02-01 08:20:36 +07:00
Valmik Jangla
0a76b8b29a
Fixed issue where no Holidays would cause the report to break
2016-01-30 10:59:40 +05:30
Agus Syahputra
0277dbc6b6
Update stock-reconciliation-for-non-serialized-item.md
2016-01-30 07:28:28 +07:00
Agus Syahputra
93a69e9485
Update authorization-rule.md
2016-01-29 23:41:46 +07:00
Anand Doshi
6e33d91443
[minor] fixes to attendance tool and employee holiday attendance
2016-01-29 16:57:54 +05:30
Valmik Jangla
07364f5ece
Feature - Employee Attendance Tool
2016-01-29 16:57:54 +05:30
Valmik Jangla
1890c794d7
Added Employee Report Attendance Report
...
Made Holiday details mandatory
2016-01-29 16:57:54 +05:30
Chao-Yee Hsu 許朝益
71a9be8add
Update material_request.py
...
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
2016-01-29 18:45:22 +08:00
Anand Doshi
fd131a4210
Merge pull request #4699 from neilLasrado/tl-fix
...
Fixes in Time Log list view
2016-01-29 15:51:24 +05:30
shreyas
1a943151d7
[Refactor/Cleanup] Cleaned debug print statement
...
Refactored code to use format() instead of string formatting using %s
2016-01-29 15:41:45 +05:30
shreyas
c761f1b0a1
[Minor] Cleanup
2016-01-29 15:41:44 +05:30
shreyas
e970ddcee9
[Fix]
...
1. Sales Person wise transaction report
2. Sales Person wise target variance report
3. Sales order trend report generation for selection in group by feild
2016-01-29 15:41:44 +05:30
shreyas
51db2ba22a
[Partial]Fixed Sales person target variance report
2016-01-29 15:41:44 +05:30
shreyas
cbc18ffdbf
[Partial] Fixed the issue for Territory Item Group Variance report
2016-01-29 15:41:44 +05:30
Neil Trini Lasrado
5b7d0a960e
Fixed indicators & List view in Time Log, Time Log Batch
2016-01-29 15:20:22 +05:30
Neil Trini Lasrado
172efb1e87
Fixed error messages while making Time Log Batch from Time Log List view
2016-01-29 14:27:03 +05:30
Anand Doshi
95760a7db6
Merge pull request #4680 from shyjuk/patch-1
...
Update index.md
2016-01-29 12:19:14 +05:30
Anand Doshi
9c24bec654
Merge branch 'nabinhait-mc_fix_5' into develop
2016-01-29 12:16:35 +05:30
Anand Doshi
7c0a58ac3f
[fix] show formatted currency value in advance paid validation
2016-01-29 12:16:24 +05:30
Anand Doshi
77e4f6b774
[fix] strip item_code before autoname
2016-01-29 11:29:36 +05:30
Nabin Hait
5bedd649df
Merge pull request #4691 from anandpdoshi/cleanup/remove-is-service-item
...
[cleanup] Removed 'Is Service Item' checkbox and filters
2016-01-29 11:10:54 +05:30
Anand Doshi
7207d21962
Merge pull request #4694 from umairsy/21-jan
...
Updated articles
2016-01-29 11:09:35 +05:30
Chao-Yee Hsu 許朝益
c118fc9343
Update material_request.py
...
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
2016-01-29 10:38:33 +08:00
Rushabh Mehta
bad13369d4
[minor] added abbreviate function in company
2016-01-27 18:58:21 +05:30
Umair Sayyed
bf225c11b4
fixed articles
2016-01-27 18:19:31 +05:30
Umair Sayyed
694edbc89a
updated articles
2016-01-27 18:19:31 +05:30
Umair Sayyed
6406f8bda0
discount article
2016-01-27 18:19:30 +05:30
Umair Sayyed
2901e14c59
articles
2016-01-27 18:19:30 +05:30
Umair Sayyed
5204eeedf7
articles
2016-01-27 18:19:30 +05:30
Nabin Hait
ee8f88d641
[patch] Set party account currency in existing orders
2016-01-27 16:01:31 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
Anand Doshi
6e36a48521
bumped to version 6.19.0
2016-01-27 14:50:19 +06:00
Anand Doshi
eca2e42ecb
[fix] patch title field of Pricing Rule
2016-01-27 12:36:36 +05:30
Anand Doshi
d7f7d5c9db
[translations]
2016-01-27 12:36:36 +05:30
Anand Doshi
37b0f7ca47
[language] Added Estonian, Telugu and Urdu. Fixes frappe/translator#64 and frappe/translator#66
2016-01-27 12:36:35 +05:30
Anand Doshi
f4d5a66162
[change log]
2016-01-27 12:36:35 +05:30
Agus Syahputra
eb4c299bdb
Update terms-and-conditions.md
2016-01-27 09:34:00 +07:00
shreyas
eba9ca4d66
[Minor]Change to maintain args ordering convention
2016-01-26 16:29:26 +05:30
Anand Doshi
01de945388
[cleanup] Removed 'Is Service Item' checkbox and filters
...
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
2016-01-26 16:22:51 +05:30
shreyas
79872bf62c
[Refactor]Changed variable name to avoid conflict between args and local variable
2016-01-26 13:57:06 +05:30
shreyas
c8ac3b042b
[Minor]Refactored code for better readability
2016-01-26 13:23:38 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
323dc96c99
[Travis] Fixed reference failure in party.py
2016-01-25 18:19:14 +05:30
shreyas
2563f404d2
[Minor Change] Updated queries.py
2016-01-25 18:19:14 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
2ea5c6913d
Merge pull request #4685 from shreyasp/supplier-credit-fix
...
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 17:58:21 +05:30
Anand Doshi
5dcb40bc96
Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy
...
[fix] obey no_copy while creating recurring documents
2016-01-25 17:27:04 +05:30
Anand Doshi
c07489a096
[fix] Journal Entry: init debit/credit in account currency
2016-01-25 17:23:36 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
Rushabh Mehta
e1a1c8ac31
[minor] clean up message if no Customer from Quotation > Sales Order, fixes #3854
2016-01-25 13:08:32 +05:30
shreyas
28a6578ba2
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 12:44:14 +05:30
Shyju Kanaprath
932cf08aee
Update index.md
2016-01-24 10:00:29 +05:30
Anand Doshi
47c2aa179b
[fix] test case for get_item_details
2016-01-21 23:18:08 +05:30
Anand Doshi
04230cb656
bumped to version 6.18.4
2016-01-21 23:02:08 +06:00
Anand Doshi
54abf025b7
[hotfix] get_price_list_rate
2016-01-21 22:28:55 +05:30
Anand Doshi
dd74b5d44f
bumped to version 6.18.3
2016-01-21 21:36:34 +06:00
Anand Doshi
afe85bdd04
[hotfix] use me.frm.doc in get_item_details
2016-01-21 21:04:16 +05:30
Nabin Hait
a1ccab81a0
bumped to version 6.18.2
2016-01-21 19:23:36 +06:00
Nabin Hait
cf3b318f7d
Changes modified date
2016-01-21 18:52:25 +05:30
Nabin Hait
568054ab96
[fix] Make Delivery Note from Sales Invoice
2016-01-21 18:50:28 +05:30
Nabin Hait
0d207706c1
[fix] Get item details
2016-01-21 18:47:09 +05:30
Nabin Hait
3d5a6af1ae
Delete Screenshot from 2014-11-18 18:13:22.png
2016-01-21 17:42:41 +05:30
Nabin Hait
79a994e895
Delete Screenshot from 2014-11-18 18:09:42.png
2016-01-21 17:42:35 +05:30
Nabin Hait
20cdaadcd4
Delete Screenshot from 2014-11-18 18:00:57.png
2016-01-21 17:42:28 +05:30
Nabin Hait
a2eccf08a1
Delete Screenshot from 2014-11-18 17:56:19.png
2016-01-21 17:42:22 +05:30
Nabin Hait
3fc4e7c53f
bumped to version 6.18.1
2016-01-21 17:40:14 +06:00
Nabin Hait
1d21274d65
Update manufacturer.json
2016-01-21 17:01:23 +05:30
Nabin Hait
c9b7824573
bumped to version 6.18.0
2016-01-21 17:22:22 +06:00
Nabin Hait
e50c5321df
[docs]
2016-01-21 16:47:51 +05:30
Nabin Hait
c690b24a7d
[change-log]
2016-01-21 16:32:09 +05:30
Nabin Hait
9a24abe5e9
[translations]
2016-01-21 16:32:08 +05:30
Saurabh
47fd5e0ff0
[fixes] compare variants in lower case
2016-01-21 15:46:55 +05:30
Nabin Hait
bb7e499cbd
Merge pull request #4662 from ccfiel/develop
...
undo reconciled journal entry record
2016-01-21 15:32:33 +05:30
Chris Ian Fiel
cb66d3a8c9
undo reconciled journal entry record
...
https://github.com/frappe/erpnext/issues/4661
2016-01-21 16:26:22 +08:00
Chris Ian Fiel
43a62ad0f0
undo reconciled journal entry record
2016-01-21 06:50:13 +08:00
Nabin Hait
e6b52bbb43
Update create_manufacturer_records.py
2016-01-21 00:30:39 +05:30
Umair Sayyed
5cd9193a2b
Updated articles in Buying
2016-01-20 18:47:33 +05:30
Nabin Hait
a613ea8abf
[patch] Create manufacturer records
2016-01-20 18:32:37 +05:30
Dominik
d737390b80
Changed Manufacturer from Data to its own DocType, copied most of the logic from Customer but used short_name for namig series.
2016-01-20 18:32:37 +05:30
Nabin Hait
fb0b24af78
Rounding based on smallest circulating currency fraction value
2016-01-20 17:07:35 +05:30
Nabin Hait
002fa6c1d9
Merge pull request #4650 from RicardoJohann/patch-2
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 17:03:06 +05:30
Nabin Hait
dbbc3eb8a6
Merge pull request #4656 from nabinhait/gle_rounding
...
[fix] Round off gle due to currency conversion
2016-01-20 16:48:42 +05:30
Nabin Hait
c2c9124af8
Merge pull request #4643 from nabinhait/status_button
...
[fix] Close button visible in all sumitted PR and DN
2016-01-20 16:47:17 +05:30
Nabin Hait
5b19aeecb4
Merge pull request #4642 from nabinhait/return_fix1
...
[fix] Accept return items in any warehouse
2016-01-20 16:46:33 +05:30
Nabin Hait
dd2f0330a6
Merge pull request #4641 from nabinhait/report-currency
...
[fix] Currency in Gross Profit report
2016-01-20 16:45:57 +05:30
Nabin Hait
61673aafd4
Merge pull request #4640 from nabinhait/fix50
...
Fixes
2016-01-20 16:35:46 +05:30
Nabin Hait
d4507ac6a0
[fix] Round off gle due to currency conversion
2016-01-20 16:14:27 +05:30
Agus Syahputra
aa8745378a
Update adding-users.md
2016-01-20 15:45:16 +07:00
RicardoJohann
3fb5340188
Update queries.py
2016-01-20 14:32:59 +08:00
RicardoJohann
05aa3b391e
Update bank_reconciliation.py
2016-01-20 13:38:20 +08:00
RicardoJohann
e095eeb084
Update bank_reconciliation_statement.py
2016-01-20 13:36:36 +08:00
RicardoJohann
6f9afffd8a
Update bank_reconciliation_statement.html
2016-01-20 12:15:20 +08:00
RicardoJohann
7425af6968
Update bank_reconciliation_detail.json
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 12:02:20 +08:00
Umair Sayyed
de15a26cab
updated stock articles
2016-01-19 18:39:27 +05:30
Nabin Hait
5ac22ce6a1
[fix] Close button visible in all sumitted PR and DN
2016-01-19 18:30:02 +05:30
Nabin Hait
20105d8a0d
[fix] Accept return items in any warehouse
2016-01-19 18:05:28 +05:30
Nabin Hait
6d8688f8b4
[fix] Currency in Gross Profit report
2016-01-19 17:27:06 +05:30
Nabin Hait
9824e22ce1
[fix] Price list rate applied via set_missing_values
2016-01-19 16:48:32 +05:30
Nabin Hait
34d2822483
Fixes in get_item_details and test cases
2016-01-19 16:48:32 +05:30
Nabin Hait
787e59c37e
[fix] BOM Autonaming
2016-01-19 16:48:31 +05:30
Nabin Hait
77532cc8db
[fix] Total Amount in Journal Entry
2016-01-19 16:48:31 +05:30
Rushabh Mehta
c978b9c36a
[minor] [fix] in Item > Add / Edit Prices, go to list view instead of report, fixes #4639
2016-01-19 16:34:49 +05:30
Nabin Hait
31608a82f8
Merge pull request #4632 from nabinhait/pos_fix
...
Calculate change in POS based on smallest currency fraction value
2016-01-19 11:46:13 +05:30
Nabin Hait
4f0bfcd287
Merge pull request #4621 from neilLasrado/develop
...
Fixed time log overlap validation. Fixed test case in time log
2016-01-19 11:13:00 +05:30
Maxwell
4da17348fd
Add localization in the on_submit event
2016-01-18 23:29:21 -02:00
Rushabh Mehta
aee26219ed
[fix] get warehouse details on selection
2016-01-18 18:57:49 +05:30
Nabin Hait
8b63b1221f
Calculate change in POS based on smallest currency fraction value
2016-01-18 17:56:55 +05:30
Rushabh Mehta
6bf3c7453b
[fix] payment request
2016-01-18 14:29:26 +05:30
Rushabh Mehta
681c9dde84
[ui] payment request cleanup
2016-01-18 14:21:45 +05:30
Rushabh Mehta
34fb5cf0e2
[fix] make setup_wizard.create_bank_account multi-company safe
2016-01-18 12:35:24 +05:30
Rushabh Mehta
0e2f9ee44c
[docs] fix
2016-01-18 12:35:24 +05:30
Anand Doshi
0bcd9efa88
[fix] value returned by frappe._ will always be unicode
2016-01-18 12:30:31 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Neil Trini Lasrado
329e7783bc
Fixed time log overlap validation. Fixed test case in time log
2016-01-15 16:34:06 +05:30
Rushabh Mehta
2e3d2b8426
Merge pull request #4613 from nabinhait/fixes
...
[fix] Item query and exchange rate
2016-01-15 11:19:44 +05:30
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Nabin Hait
ad42d2f67a
Minor fixes
2016-01-15 11:09:41 +05:30
Rushabh Mehta
1bf440b03a
[fix] module ordering
2016-01-14 18:19:21 +05:30
Rushabh Mehta
9bf2df9303
[minor] [layout] cleaned up Time Log layout
2016-01-14 18:19:21 +05:30
Rushabh Mehta
986f6a71ec
[minor] fix new customer link in POS
2016-01-14 18:15:56 +05:30
Neil Trini Lasrado
975dcc2bf3
Added additional cost to time log. Fixed issues in Time log billing amount calculation and billing amount calculation while making time log batch
2016-01-14 16:09:35 +05:30
Saurabh
f7caad8ecb
[fixes] redirect uri fixes
2016-01-14 11:30:47 +05:30
Nabin Hait
a88912a2f5
[fix] Item query and exchange rate
2016-01-14 10:43:17 +05:30
Rushabh Mehta
10d634b016
[fix] set sales partner from previous document, fixes #4611
2016-01-14 10:34:18 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Rushabh Mehta
075b9626cf
[docs] update
2016-01-12 17:08:33 +05:30
Saurabh
cbebb4b8ba
[fixes] code cleanup
2016-01-12 14:13:35 +05:30
Saurabh
3ade883fd9
[fixes] place cart button via js
2016-01-12 14:09:52 +05:30
Saurabh
403ad48364
[fixes] display cart count only if item exist in cart
2016-01-12 14:09:52 +05:30
Saurabh
69f9975748
[fixes] show link to visit cart after adding item, hide cart button on cart view
2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
2016-01-12 14:09:52 +05:30
Saurabh
a940b6d149
[fixes] handle cancled payment requests
2016-01-12 14:09:51 +05:30
Saurabh
0a0c78729f
[enhace] display payment status on order
2016-01-12 14:09:51 +05:30
Saurabh
276d3e60bd
[enhance] pay via cart
2016-01-12 14:09:51 +05:30
Saurabh
c22e525a14
[Fixes] payment request url fixes
2016-01-12 14:09:51 +05:30
Saurabh
2ffea6ba94
[document & fixes] document and test case rewrite
2016-01-12 14:09:51 +05:30
Saurabh
6fc408e974
[fixes] conmify account details and validate gateway currency
2016-01-12 14:09:51 +05:30
Saurabh
ed0723c6fe
[fixes] Create payment gateway account
2016-01-12 14:09:50 +05:30
Saurabh
766f6a43d5
[fixes] test case for Payment request
2016-01-12 14:09:50 +05:30
Saurabh
1664668b0e
[fixes] multi-currency fixes
2016-01-12 14:09:50 +05:30
Saurabh
3ba22676bf
[fixes] Create and manage payment request
2016-01-12 14:09:50 +05:30
Saurabh
db7a56b453
[fixes] fieldtype, message fixes on Payment Request
2016-01-12 14:09:50 +05:30
Saurabh
cb98d9ec5f
[fixes] print format listing
2016-01-12 14:09:50 +05:30
Saurabh
b109ee96de
[fixes] Base structure for Payment Request
2016-01-12 14:09:49 +05:30
Saurabh
eba7aa496c
[enhace] basic structure for payment gateway
2016-01-12 14:09:49 +05:30
Rushabh Mehta
c85112b093
bumped to version 6.17.0
2016-01-12 12:55:17 +06:00
Rushabh Mehta
4a3140102c
Merge pull request #4606 from nabinhait/report_currency
...
[fix] Currency symbol based on account/company currency, not based on Global Defaults
2016-01-12 12:12:43 +05:30
Rushabh Mehta
6ef1fb6b39
Merge pull request #4605 from umairsy/docs
...
[docs] added articles in manufacturing, stock, website
2016-01-12 12:12:08 +05:30
Rushabh Mehta
de6b30c7ac
Merge pull request #4604 from anandpdoshi/fix/duplicate-region-setup-wizard
...
[fix] removed duplicate 'region' section as it is already in Frappe Framework
2016-01-12 12:11:41 +05:30
Rushabh Mehta
1c32d05601
[translations] update
2016-01-12 12:02:26 +05:30
Rushabh Mehta
659bc1aca4
[minor] fixes reported on support
2016-01-12 11:57:25 +05:30
Nabin Hait
226a101119
[fix] Currency symbol based on account/company currency, not based on Global Defaults
2016-01-12 11:56:40 +05:30
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
vrms
063a88f057
Update implementation-strategy.md
2016-01-09 19:45:39 +08: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
Martin Ender
fc5d5d1600
Create print-format.md
2015-12-15 17:22:13 +05:30
Martin Ender
180d7e9ceb
Create hiding-modules-and-features.md
2015-12-15 17:22:12 +05:30
Martin Ender
7be281e712
Create document-title.md
2015-12-15 17:22:12 +05:30
Martin Ender
9d5f4f729e
Update customize-form.md
2015-12-15 17:22:12 +05:30
Martin Ender
b68087d690
Update customize-form.md
2015-12-15 17:22:12 +05:30
Martin Ender
a970e72819
Create customize-form.md
2015-12-15 17:22:12 +05:30
Martin Ender
4d0c5a51c9
Create custom-button.md
2015-12-15 17:22:12 +05:30
Martin Ender
41e1eb6af7
Create update-field-based-on-value-in-other-date-field.md
2015-12-15 17:22:12 +05:30
Martin Ender
1761004bd5
Create sales-invoice-id-based-on-sales-order-id.md
2015-12-15 17:22:12 +05:30
