Rushabh Mehta
f1083c9a74
[minor] fix messages in material request
2016-02-29 14:38:25 +05:30
Nabin Hait
94a1f3eb90
[fix] Time Log overlap validation and test cases
2016-02-29 13:15:27 +05:30
Nabin Hait
5a4c7d3b62
[patch] repost valuation rate for serialized items
2016-02-29 12:07:42 +05:30
Nabin Hait
2620bf402f
[fix] Stock Valuation for serialized items
2016-02-29 12:07:42 +05:30
Agus Syahputra
1b28f58829
Update withdrawing-salary-from-owners-equity-account.md
2016-02-29 08:04:02 +07:00
Agus Syahputra
034fcb3410
Update update-stock-option-in-sales-invoice.md
2016-02-28 11:49:00 +07:00
Rushabh Mehta
4403853828
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-02-27 16:24:34 +05:30
ShashaQin
8d1dea6aad
Update recurring_document.py
2016-02-27 14:00:58 +08:00
Nabin Hait
f34e63123f
Merge pull request #4877 from agusputra/patch-18
...
Update period-closing-voucher.md
2016-02-27 10:11:20 +05:30
Nabin Hait
598c9c4679
Merge pull request #4884 from umairsy/feb-2nd
...
updated manual
2016-02-27 10:10:34 +05:30
Nabin Hait
2174790545
Merge pull request #4886 from saurabh6790/add_projected_qty_on_quotation
...
[fixes] set projected qty in Quotaion Item table
2016-02-27 10:04:20 +05:30
Nabin Hait
f9103b1b0b
Merge pull request #4887 from sbkolate/patch-3
...
enable uom in BOM Table View
2016-02-27 10:02:59 +05:30
Nabin Hait
e0cc597f70
Merge pull request #4888 from agusputra/patch-19
...
Update freeze-accounting-entries.md
2016-02-27 10:02:24 +05:30
Agus Syahputra
8fa6f79f7e
Update managing-transactions-in-multiple-currency.md
2016-02-27 07:22:50 +07:00
Agus Syahputra
f7face6384
Update freeze-accounting-entries.md
2016-02-27 07:08:20 +07:00
Anand Doshi
18e988e4ce
bumped to version 6.23.6
2016-02-26 21:28:26 +06:00
Anand Doshi
7b52dc9f32
[hotfix] added back comment_feed_communication patch
2016-02-26 20:51:33 +05:30
sbkolate
a897882434
enable uom in BOM Table View
...
reference
https://discuss.erpnext.com/t/uom-in-item-tables/10733/4
2016-02-26 19:32:11 +05:30
Saurabh
cc7132763f
[fixes] set projected qty in Quotaion Item table
2016-02-26 18:33:53 +05:30
Nabin Hait
658b3260c2
bumped to version 6.23.5
2016-02-26 18:04:46 +06:00
Umair Sayyed
d1029b54c2
updated manual
2016-02-26 17:32:44 +05:30
Nabin Hait
56f7fa66ad
[fix] Time log overlap validation
2016-02-26 17:19:11 +05:30
Nabin Hait
bdf0f0a08d
[fix] Show debit note button in purchase invoice
2016-02-26 16:26:28 +05:30
Nabin Hait
eb0c08f328
bumped to version 6.23.4
2016-02-26 15:51:02 +06:00
Nabin Hait
0f6eac3b35
[fix] Show credit note button in sales invoice
2016-02-26 13:01:32 +05:30
Agus Syahputra
91bd4ce3e1
Update period-closing-voucher.md
2016-02-26 07:45:14 +07:00
Nabin Hait
cd3b37dcfe
bumped to version 6.23.3
2016-02-25 19:43:31 +06:00
Nabin Hait
55f0834e99
[fix] Show payment button in purchase invoice
2016-02-25 19:12:37 +05:30
Nabin Hait
6107ccd5ea
bumped to version 6.23.2
2016-02-25 15:48:42 +06:00
Nabin Hait
737849a0f5
[patch] Update stopped status to close
2016-02-25 15:16:02 +05:30
ShashaQin
ed71e6cea6
Update test_recurring_document.py
2016-02-25 15:47:25 +08:00
ShashaQin
5afca21571
Update test_recurring_document.py
2016-02-25 15:21:14 +08:00
Nabin Hait
6c7c1223c3
bumped to version 6.23.1
2016-02-25 12:29:39 +06:00
Nabin Hait
a1d5494fb3
Merge pull request #4867 from KanchanChauhan/item-group
...
Added pagination to Products web page
2016-02-25 11:56:30 +05:30
Nabin Hait
e9065677c6
Merge pull request #4866 from neilLasrado/develop
...
Fixes in Setup Wizard
2016-02-25 11:06:14 +05:30
Nabin Hait
1a9c1c4243
Merge pull request #4868 from nabinhait/bom_fix
...
[fix] validate BOMs in BOM Replace Tool
2016-02-25 10:41:38 +05:30
ShashaQin
6071ddc3dd
Update recurring_document.py
2016-02-25 11:25:24 +08:00
ShashaQin
73c71f9dd5
Update sales_order.json
2016-02-25 11:22:27 +08:00
ShashaQin
2f0a14bda0
Update purchase_order.json
2016-02-25 11:19:56 +08:00
ShashaQin
ae629ad29f
Update purchase_invoice.json
2016-02-25 11:17:13 +08:00
ShashaQin
02a38e8b5e
Update sales_invoice.json
...
Add 'Notify by Email' check box and set next_date can be changed by user
2016-02-25 11:13:19 +08:00
sbkolate
f9a9754dab
opportunities status fix in Sales Funnel report
...
reference https://discuss.erpnext.com/t/sales-funnel-not-showing-updated-opportunities/10702/4
2016-02-24 19:25:35 +05:30
Nabin Hait
baa6d96a82
[fix] validate BOMs in BOM Replace Tool
2016-02-24 18:51:13 +05:30
Nabin Hait
ed08e88de4
bumped to version 6.23.0
2016-02-24 18:49:22 +06:00
Nabin Hait
40505dcfb1
[change-log]
2016-02-24 18:17:14 +05:30
Neil Trini Lasrado
3c0d5cbab5
Fixes in Setup Wizard
2016-02-24 18:02:08 +05:30
Kanchan Chauhan
0d6db633f7
Added pagination to Products web page
2016-02-24 17:29:25 +05:30
Saurabh
00212a23e1
[fixes] removed base_grand_total from payment request
2016-02-24 16:50:19 +05:30
Saurabh
6d1dbd6384
[fixes] currency exchange rate and payment gateway account fixes for multicurrency
2016-02-24 15:07:26 +05:30
Saurabh
4a6bbf9b72
[fixes] added filters company and currency to get account, removed account name wise comparison
2016-02-24 15:07:26 +05:30
Saurabh
f54be2c7f0
[fixes] test case fixes for multi-currency check
2016-02-24 15:07:25 +05:30
Saurabh
1864879b91
[fixes] fix grand total calculation for Payment Request and set visibility of Resend Payment Email button
2016-02-24 15:07:25 +05:30
Saurabh
3a2682919a
[enhance] set customer payable account to new customer as per payment gateway account currency via cart if cart and checkout is enable
2016-02-24 15:07:25 +05:30
Saurabh
2dc2d671da
[clean-up]
2016-02-24 15:07:25 +05:30
Saurabh
7d5b47e113
[fixes] minor fix in test-case
2016-02-24 15:07:25 +05:30
Saurabh
fa32588e72
[fixes] minor fix in test-case
2016-02-24 15:07:25 +05:30
Saurabh
1e800a9ef0
[fixes] multi-currency via payment request
2016-02-24 15:07:25 +05:30
Saurabh
da9e9cdb13
[fixes] minor get_payment_gateway_account
2016-02-24 15:07:24 +05:30
Saurabh
dca6302e15
[fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment
2016-02-24 15:07:24 +05:30
Saurabh
883cc04701
[fixes] compare attributes in lower case
2016-02-24 15:07:24 +05:30
Nabin Hait
da297dcfc5
[translations]
2016-02-24 14:37:38 +05:30
Anand Doshi
acd1bcffde
[fix] changed field type to Code
2016-02-24 12:38:08 +05:30
Nabin Hait
57b30430e4
Merge pull request #4695 from neilLasrado/develop
...
Material Request of type Manufcture
2016-02-24 12:30:53 +05:30
Nabin Hait
d2d261dc87
Merge pull request #4854 from patilsangram/develop
...
Removed Stop Button from SO and PO
2016-02-24 11:21:17 +05:30
Nabin Hait
38f470288f
Merge pull request #4806 from creador30/productbundle_improvement
...
Product Bundle improvement
2016-02-24 11:12:47 +05:30
Nabin Hait
1a16a4f394
Merge pull request #4863 from agusputra/patch-17
...
Update opening-accounts.md
2016-02-24 11:11:06 +05:30
Agus Syahputra
6338f407d9
Update opening-accounts.md
2016-02-24 07:28:46 +07:00
Agus Syahputra
eeda0460d4
Update multi-currency-accounting.md
2016-02-24 07:26:06 +07:00
creador
4b6b6fe5a8
[fix] unify packing description and packed item description
2016-02-23 22:12:02 +02:00
saurabh
64ec677cf7
deleted extra doctype
2016-02-24 01:07:49 +05:30
patilsangram
a812d67837
[fixes]
2016-02-23 19:04:29 +05:30
Neil Trini Lasrado
f79760ce2d
Mumtiple fixes
2016-02-23 18:35:45 +05:30
Neil Trini Lasrado
0dd8500393
Fixed Documentation
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
d5e15eaadf
Added test cases
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
fd9dc5e9f5
refactor code in Production Planning Tool
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
877e2ebff8
Fixed Production PLanning Tool
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
43114bab71
renamed label of Quantity Requested for Purchase to Requested Quantity in Bin
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
dddf42560f
Added code to update Material Request on Submission of Production Order
2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
abd9248ba6
Rename sales_order_no to sales_order in Material Request Item
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
0b40ccc43c
Removed unwanted code
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
695bf47a1d
changed image feild (type attach) to attach image, removed Image view
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
e9cd22aff9
Fixed make Prod_order from Material Request
2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
9739dc3639
Added make Production Order button against Material Request
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
cc23bc0549
Removed Material Request type validation
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
966e5643c9
Added Material Request Link to Production Order
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
3353b5ee62
Added material request type Manufacture
2016-02-23 18:35:42 +05:30
Saurabh
ac33724656
[fixes] removed no copy for warehouse field
2016-02-23 18:18:04 +05:30
Saurabh
3724448cd3
[fixes] typo-fixes and fix in balance qty fetching
2016-02-23 18:18:04 +05:30
Saurabh
dcb72c6be7
[enhance] Displaying stock balance while creating quotation
2016-02-23 18:18:04 +05:30
Nabin Hait
8a59c33e2f
[fix] Sales Person target variance report: based on lft and rgt of item group
2016-02-23 15:23:24 +05:30
saurabh
42d5d8390d
Resolved conflicts
2016-02-23 13:15:02 +05:30
saurabh
fb71f32ebf
conflicts resolved
2016-02-23 02:26:37 +05:30
saurabh
2e2dd0fb42
Documentation of multilingual print format and minor fixes
2016-02-23 02:17:04 +05:30
rohit waghchaure
da321b44cb
removed translator
2016-02-23 02:17:04 +05:30
saurabh
9364f35a2c
fixed issue of stock_uom translator
2016-02-23 02:17:04 +05:30
saurabh
724b4b17a5
changed method to set code of language
2016-02-23 02:17:03 +05:30
saurabh
fbcf44657c
test case for translation doctype
2016-02-23 02:17:03 +05:30
saurabh
c422c23813
import method to load all languages in language field on customer form
2016-02-23 02:17:03 +05:30
saurabh
f703198082
replaced methd
2016-02-23 02:17:03 +05:30
saurabh
ca3e7152d6
removed add fetch method
2016-02-23 02:17:03 +05:30
saurabh
8e49951821
fetch customer or supplier language and set on sales and purchase flow's form
2016-02-23 02:17:03 +05:30
saurabh
65820ed013
added new field language for users
2016-02-23 02:17:03 +05:30
saurabh
533a0f6527
created new file
2016-02-23 02:17:03 +05:30
saurabh
60def66644
added translator into print format
2016-02-23 02:17:02 +05:30
saurabh
24358db7bf
changed fieldname from print_language to language
2016-02-23 02:17:02 +05:30
saurabh
648fd33576
removed languages filled methods, added this methods into new file
2016-02-23 02:17:02 +05:30
saurabh
5265aa43e4
added add_fetch method
2016-02-23 02:17:02 +05:30
saurabh
4db3b3cf1e
removed add_fetch method
2016-02-23 02:17:02 +05:30
saurabh
29d77be648
pulled languages into the field print language
2016-02-23 02:17:02 +05:30
saurabh
cc7c9e4d0f
on selection of supplier pulled default print language
2016-02-23 02:17:02 +05:30
saurabh
b1efceccd4
added field print languages
2016-02-23 02:17:02 +05:30
sbkolate
b17d4035c1
better validation example for developer
...
throw "past date selected" will freeze the form and user can not correct value of from_date.
but validated false will just throw the pop-up and user can correct value of from_date and save the form.
Example changed from Event to Task because same is available in Custom Script Help for desk user
2016-02-22 17:16:34 +05:30
Nabin Hait
22230afa0a
Merge pull request #4852 from nabinhait/fixes72
...
Fixes
2016-02-22 16:51:20 +05:30
Nabin Hait
e32f9c3a24
Update reorder_item.py
2016-02-22 16:50:13 +05:30
patilsangram
bf2b511988
[Removed Stop Button from SO and PO]
2016-02-22 16:24:23 +05:30
Nabin Hait
38be62c7e3
[fix] Allow auto reorder based on reorder qty, even if reordeer level is zero
2016-02-22 16:24:23 +05:30
Nabin Hait
7736e092e7
Merge branch 'reorder_level_zero' of https://github.com/creador30/erpnext into creador30-reorder_level_zero
2016-02-22 16:19:33 +05:30
Nabin Hait
db746f5bc7
[fix] Condition for Payment and Return button visibility
2016-02-22 16:17:10 +05:30
Nabin Hait
68eb689450
[fix] UOM fixed in Item-wise Purchase History report
2016-02-22 16:17:10 +05:30
Roland
ed2849adf9
Create at_austria_chart_Einheitskontenrahmen.json
...
Austrian Chart of Accounts compiled by fairkom.eu from various sources, among them the official "Österreichishcer Kontenrahmen" published by ÖPWZ - Fachsenat für Betriebswirtschaft und Organisation der Kammer der Wirtschaftstreuhänder Version May 2014. Numbering scheme has been slightly adapted to fit best with ERPnext setup of a company, where the most important accounts are automatically assigned. When using this chart of accounts, feel free to reduce / adapt the accounts - it is not legally binding.
2016-02-22 09:26:54 +01:00
Kanchan Chauhan
49c4aa6ce3
Minor fix
2016-02-19 17:36:52 +05:30
Kanchan Chauhan
2e8cc89e34
Added webform for Job Opening
2016-02-19 17:31:13 +05:30
Nabin Hait
ddcd8c58bf
minor fix
2016-02-19 16:09:11 +05:30
Anand Doshi
8fc643a815
bumped to version 6.22.1
2016-02-19 13:43:01 +06:00
Anand Doshi
626e8fc03b
[change-log]
2016-02-19 13:11:02 +05:30
Anand Doshi
52780cb937
Merge pull request #4841 from nabinhait/escape
...
[fix] Escaping strings with percentage
2016-02-19 13:01:00 +05:30
Anand Doshi
3bce3f412a
Merge pull request #4838 from nabinhait/rounding_gle
...
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-19 12:59:54 +05:30
Nabin Hait
1a99cb8bfe
[fix] Escaping strings with percentage
2016-02-19 12:45:57 +05:30
rohit waghchaure
ff321763cf
removed translator
2016-02-19 12:02:02 +05:30
saurabh
5a265408a3
fixed issue of stock_uom translator
2016-02-19 11:46:29 +05:30
saurabh
c26c6c368c
changed method to set code of language
2016-02-19 11:46:29 +05:30
saurabh
f1949781d6
test case for translation doctype
2016-02-19 11:46:29 +05:30
saurabh
755fefbfd4
import method to load all languages in language field on customer form
2016-02-19 11:46:29 +05:30
saurabh
3c2a10bf9f
replaced methd
2016-02-19 11:46:28 +05:30
saurabh
49c9746816
removed add fetch method
2016-02-19 11:46:28 +05:30
saurabh
c2dae35966
fetch customer or supplier language and set on sales and purchase flow's form
2016-02-19 11:46:28 +05:30
saurabh
a1c3ea2f86
added new field language for users
2016-02-19 11:46:28 +05:30
saurabh
3dcd4f3682
created new file
2016-02-19 11:46:28 +05:30
saurabh
a6f57e1c4b
added translator into print format
2016-02-19 11:46:28 +05:30
saurabh
2192ffe5af
changed fieldname from print_language to language
2016-02-19 11:46:28 +05:30
saurabh
6b6977a090
removed languages filled methods, added this methods into new file
2016-02-19 11:46:28 +05:30
saurabh
c14f2c29b9
added add_fetch method
2016-02-19 11:46:27 +05:30
saurabh
5d45176a1d
removed add_fetch method
2016-02-19 11:46:27 +05:30
saurabh
b4079095fb
pulled languages into the field print language
2016-02-19 11:46:27 +05:30
saurabh
3ec7649bae
on selection of supplier pulled default print language
2016-02-19 11:46:27 +05:30
saurabh
844cb5c810
added field print languages
2016-02-19 11:46:27 +05:30
Anand Doshi
6e8eaf097a
[fix] test case of Leave Application
2016-02-19 00:27:02 +05:30
Neil Trini Lasrado
f5a39d628f
Typo Fixes
2016-02-18 19:19:07 +05:30
Nabin Hait
fb24a27201
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-18 19:18:07 +05:30
Nabin Hait
fa413bbab2
Update accounts_controller.py
2016-02-18 18:23:31 +05:30
Anand Doshi
d843ec5fee
Merge pull request #4831 from neilLasrado/typos
...
Typo fixes in Accounts Module
2016-02-18 17:24:17 +05:30
Nabin Hait
67f40775ff
Update accounts_controller.py
2016-02-18 17:10:42 +05:30
Nabin Hait
7209cff29a
Merge pull request #4832 from revant/patch-1
...
Need to use set_balance_in_account_currency
2016-02-18 17:02:43 +05:30
Revant Nandgaonkar
78a62fe123
change args of set_balance_in_account_currency
...
https://github.com/frappe/erpnext/pull/4832
2016-02-18 16:48:35 +05:30
Anand Doshi
d9dc9e4616
Merge pull request #4827 from anandpdoshi/fix/bank-reconciliation-grid
...
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-18 16:14:56 +05:30
Revant Nandgaonkar
5da941b82c
Need to use set_balance_in_account_currency
...
b9ad5178e4
2016-02-18 16:02:05 +05:30
Anand Doshi
bd0086c1c7
Merge pull request #4826 from anandpdoshi/fix/return-warehouse-mandatory
...
[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock
2016-02-18 15:02:11 +05:30
Neil Trini Lasrado
8e7240a556
Typo fixes in Accounts Module
2016-02-18 14:38:36 +05:30
Anand Doshi
828d5ffaab
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-17 18:31:58 +05:30
Anand Doshi
ed8d9dadfa
[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock
2016-02-17 17:14:11 +05:30
Valmik Jangla
7ae844f0a0
Minor fix
2016-02-17 15:06:30 +05:30
Valmik Jangla
b7ae1c1076
Inactive employees show up in report
2016-02-17 15:05:35 +05:30
Anand Doshi
5136a64d12
Merge pull request #4822 from neilLasrado/hr-fix
...
[minor] - fixed image view issues in Employee master.
2016-02-17 13:27:25 +05:30
Anand Doshi
1d77452fe0
bumped to version 6.22.0
2016-02-17 13:32:25 +06:00
Neil Trini Lasrado
25ab93a881
Changed image in employee from Attach to Attach Image, removed image view
2016-02-17 13:00:37 +05:30
Anand Doshi
9c0983f1b6
[translations]
2016-02-17 12:59:54 +05:30
Anand Doshi
9aaa6e3ea0
[change-log]
2016-02-17 12:26:28 +05:30
Anand Doshi
870d0441a8
[minor] moved make_employee from Employee to Offer Letter
2016-02-16 15:53:09 +05:30
Valmik Jangla
5e771c5678
Changed doclist to doc
2016-02-16 15:33:35 +05:30
Valmik Jangla
93b1072cba
Improved code
2016-02-16 15:33:35 +05:30
Valmik Jangla
bddc80bc66
Make Employee from Offer Letter
2016-02-16 15:33:35 +05:30
Anand Doshi
9a933788be
[cleanup] Compact Item Print
2016-02-16 15:30:17 +05:30
ShashaQin
541abf5687
Update item_table_description.html
2016-02-16 15:07:09 +05:30
ShashaQin
fd08750e1c
Update print_settings.py
2016-02-16 15:07:09 +05:30
ShashaQin
426bf4b5bb
Update features_setup.json
2016-02-16 15:07:09 +05:30
ShashaQin
2331d4f9a1
Update features_setup.json
2016-02-16 15:07:09 +05:30
ShashaQin
c77669f3d1
Update item_table_description.html
2016-02-16 15:07:09 +05:30
ShashaQin
429ab205d4
Update print_settings.py
2016-02-16 15:07:09 +05:30
Javier Wong
3d1f01ffc1
Fixed Get Open Sales Orders with Item Filter
...
Previously Get Open Sales Orders with Item Filter does not filter properly and instead returns Sales Orders with all Items.
2016-02-16 14:40:18 +05:30
Anand Doshi
1d866e8ae0
Merge pull request #4815 from makeen/fix_add_subscribers
...
[fix] add subscribers even though some emails are invalid
2016-02-16 14:36:31 +05:30
Anand Doshi
d4069fa634
Merge pull request #4814 from rmehta/exclude-bom-from-delete-company
...
[fix] exclude BOM from delete company records and unset company in others
2016-02-16 14:33:21 +05:30
Anand Doshi
a8ad388fba
Merge pull request #4811 from anandpdoshi/fix/trial-balance-fiscal-year
...
[fix] validate Fiscal Year in Trial Balance
2016-02-16 14:31:57 +05:30
Anand Doshi
c83802fae1
[fix] Setup Wizard: use correct customer, supplier name in create contact. Fixes #4804 .
2016-02-16 13:30:17 +05:30
Anand Doshi
efef236fdf
Merge pull request #4800 from agusputra/patch-15
...
Update payment-request.md
2016-02-16 13:18:29 +05:30
Anand Doshi
561e6cd27b
[fix] Trial Balance to General Ledger: use data.from_date and data.to_date
2016-02-16 11:56:53 +05:30
Anand Doshi
5f72504de1
[enhancement] Expense Claim - View Bank Entries
2016-02-15 18:02:38 +05:30
makeen
4741182b25
[fix] add subscribers even though some emails are invalid
2016-02-15 10:58:12 +01:00
Rushabh Mehta
771568f42a
[fix] exclude BOM from delete company records and unset company in others
2016-02-15 15:17:34 +05:30
Anand Doshi
620252cadb
[fix] validate Fiscal Year in Trial Balance
2016-02-15 12:03:04 +05:30
Anand Doshi
0e553aa6b8
bumped to version 6.21.6
2016-02-15 12:23:57 +06:00
Anand Doshi
39a289145c
[fix] fetch price list rate
2016-02-15 11:42:18 +05:30
creador
e156cd6379
Product Bundle improvement
...
This change allows addition of multiple instances of the same product
inside a product bundle, if each has a different description in the
bundle list (thus no duplicates).
We use product bundles to include scrap material into our stock
calculations. Here we need to enter the same product with different
quantities into the same bundle. We explicitly specify scrap in the
description of each line in product bundle.
2016-02-14 12:22:10 +02:00
creador
e71fa9210f
Allow reorder_level to be set to 0
...
For items you don’t want to keep in stock, you can set the
reorder_level to 0 and define reorder_qty.
If there is e.g. a sales order for that item, the projected quantity
will fall below 0, which will trigger an automatic material request.
2016-02-14 11:58:21 +02:00
Agus Syahputra
e9a1f1c5d8
Update payment-request.md
2016-02-13 10:35:42 +07:00
Rushabh Mehta
2e9f10934f
bumped to version 6.21.5
2016-02-12 13:42:48 +06:00
Anand Doshi
4b249fe8ec
[optimization] stock balance report - force index + improve memory usage
2016-02-11 20:38:01 +05:30
Rushabh Mehta
eab1671214
[fix] [pos] refresh party field, fixes #4789
2016-02-11 18:35:59 +05:30
Rushabh Mehta
6f574cd60f
[minor] do not commit pay-to-recd from in journal entry
2016-02-11 14:27:28 +05:30
Rushabh Mehta
580933998e
bumped to version 6.21.4
2016-02-11 13:11:22 +06:00
Rushabh Mehta
adee283caf
[minor] map custom fields from delivery note to packing slip
2016-02-11 11:58:50 +05:30
Rushabh Mehta
f2763d7abe
[cleanup] warranty claim form
2016-02-11 11:06:15 +05:30
Rushabh Mehta
1652839086
[minor] [fix] address trigger in warranty claim
2016-02-11 11:06:15 +05:30
Nabin Hait
1ec626f39b
bumped to version 6.21.3
2016-02-10 16:41:58 +06:00
Nabin Hait
7e02831897
[fix] Test case fixed
2016-02-10 15:54:52 +05:30
Rushabh Mehta
c54d7ec445
Merge pull request #4768 from umairsy/feb-1st-week
...
Updated help on manufacturing module.
2016-02-10 15:44:42 +05:30
Rushabh Mehta
a4faffb813
Merge pull request #4783 from nabinhait/fixes54
...
[fix] call get_party_account only if party is set
2016-02-10 15:24:03 +05:30
Umair Sayyed
4715df1518
Removed current directory
2016-02-10 15:19:35 +05:30
Umair Sayyed
fc8d0f6ac7
help on manufacturing module
2016-02-10 15:19:35 +05:30
Rushabh Mehta
477ddf9119
bumped to version 6.21.2
2016-02-10 15:21:18 +06:00
Nabin Hait
ef864403a1
[fix] call get_party_account only if party is set
2016-02-10 14:47:25 +05:30
Anand Doshi
4fcf7bf01a
[minor] Setup Wizard sample data: Clear Fiscal Year Error message
2016-02-10 14:35:48 +05:30
Anand Doshi
bec7e79ee8
bumped to version 6.21.1
2016-02-10 13:49:17 +06:00
Anand Doshi
247a8eedce
[minor] fix add_comment
2016-02-10 13:17:40 +05:30
Rushabh Mehta
cc35f62514
Merge pull request #4781 from nabinhait/develop
...
Payment Request Fixes
2016-02-10 13:13:27 +05:30
Rushabh Mehta
8d1c7a2524
[fix] call get_party_account only if party is set
2016-02-10 13:08:42 +05:30
Nabin Hait
3070deb295
Packing Slip layout changes
2016-02-10 13:07:42 +05:30
Nabin Hait
e1f6e60cea
[fix] Payment Request Fixes
2016-02-10 13:07:42 +05:30
Rushabh Mehta
3aa14f54b7
[fix] installation note item description to Text Editor
2016-02-10 11:56:05 +05:30
Rushabh Mehta
826900822c
bumped to version 6.21.0
2016-02-09 13:15:24 +06:00
Rushabh Mehta
6584240277
[change log]
2016-02-09 12:35:51 +05:30
Rushabh Mehta
dd408d82da
[translations]
2016-02-09 12:24:56 +05:30
Rushabh Mehta
5ddb8ea124
Merge pull request #4773 from agusputra/patch-14
...
Update search-record-by-specific-field.md
2016-02-09 11:20:19 +05:30
Rushabh Mehta
7f3983a3d6
Merge pull request #4769 from rmehta/pricing-rule-on-variant
...
[fix] pricing rule for variant, if rule for template available, use it
2016-02-09 11:20:00 +05:30
Nabin Hait
adc0923c7e
[fix] validate advance only if invoice total is positive
2016-02-09 10:32:41 +05:30
Agus Syahputra
cb7337f466
Update search-record-by-specific-field.md
2016-02-09 09:20:26 +07:00
Agus Syahputra
68e6919d41
Update managing-dynamic-link-fields.md
2016-02-09 01:04:01 +07:00
Rushabh Mehta
57ebde2b9e
Merge pull request #4765 from agusputra/patch-12
...
Update allow-fields-to-be-changed-after-submit.md
2016-02-08 18:53:51 +05:30
Rushabh Mehta
10663ab37f
Merge pull request #4762 from nabinhait/multifixes3
...
Advance adjustment in invoice cannot be greater than grand total
2016-02-08 18:53:27 +05:30
Rushabh Mehta
0a67c9715c
Merge pull request #4766 from nabinhait/permlevel1
...
[fix] Read permission to All for permlevel 1 fields
2016-02-08 18:52:03 +05:30
Rushabh Mehta
c403ce3b4f
Merge pull request #4763 from rmehta/leave-app-cleanup
...
[cleanup] leave application
2016-02-08 18:51:29 +05:30
Rushabh Mehta
3cdf3544fb
[enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue
2016-02-08 18:50:40 +05:30
Rushabh Mehta
faf9b589c4
[fix] pricing rule for variant, if rule for template available, use it
2016-02-08 18:49:27 +05:30
Rushabh Mehta
060f32d452
[fix] [minor] reset naming series in delete_company_transactions.py
2016-02-08 17:57:14 +05:30
Nabin Hait
4c6af87ad0
[fix] Read permission to All for permlevel 1 fields
2016-02-08 16:56:19 +05:30
Rushabh Mehta
a064e3a200
[minor] validate address template before saving
2016-02-08 14:51:14 +05:30
Anand Doshi
1106524121
Merge pull request #4644 from anandpdoshi/enhancement/comment-feed-communication-merge
...
[enhancement] Merge Comment and Feed into Communication 💥
2016-02-08 13:54:48 +05:30
Agus Syahputra
451ee87e9f
Update allow-fields-to-be-changed-after-submit.md
2016-02-08 15:16:42 +07:00
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Rushabh Mehta
6bd9f7f5f0
[minor] catch duplicate entry error in bank account creation
2016-02-08 12:09:01 +05:30
Nabin Hait
289ffb788c
[fix] Advance adjustment in invoice cannot be greater than grand total
2016-02-08 11:07:00 +05:30
Nabin Hait
45805622e4
[fix] Serial no query in Quality Inspection
2016-02-08 11:06:59 +05:30
Rushabh Mehta
467f5c7a75
Merge pull request #4751 from agusputra/patch-11
...
Update calendar.md
2016-02-08 10:59:06 +05:30
Rushabh Mehta
ca2ce13817
Merge pull request #4748 from vjFaLk/Monthly-attendance-fix
...
Employees with no attendance show up as blank now
2016-02-08 10:58:45 +05:30
Rushabh Mehta
57fb74f262
Merge pull request #4742 from nabinhait/multifixes1
...
Multi fixes
2016-02-08 10:55:48 +05:30
Rushabh Mehta
cde997edfa
[cleanup] leave application
2016-02-08 10:53:22 +05:30
Nabin Hait
2b8472fe54
Merge pull request #4744 from ccfiel/develop
...
undo bank recon.
2016-02-08 10:45:55 +05:30
Rushabh Mehta
65ade073a9
Merge pull request #4733 from ShashaQin/patch-15
...
Update leave_application.py
2016-02-08 10:22:09 +05:30
Rushabh Mehta
e881b40ab2
Merge pull request #4759 from Tropicalrambler/patch-2
...
Corrected typo while translating
2016-02-08 10:10:57 +05:30
Tropicalrambler
3ebd956090
Duplicate last line delete
...
Deleted the last line which was duplicated. Both read exactly the same. Only one line is necessary.
2016-02-07 18:56:44 -06:00
Tropicalrambler
b01f1d2486
Corrected typo while translating
...
Found a switch of letters: "wrokstation" instead of "workstation". Corrected the item appropriately. Found this while translating my fork of this page to spanish.
2016-02-07 16:39:12 -06:00
Agus Syahputra
4c0c69b388
Update calendar.md
2016-02-07 11:45:10 +07:00
Rushabh Mehta
16d58560a0
Merge pull request #4750 from agusputra/patch-10
...
Update wesite-home-page.md
2016-02-06 09:40:05 +05:30
Agus Syahputra
12acd11814
Update wesite-home-page.md
2016-02-06 08:13:29 +07:00
Agus Syahputra
c4d3283879
Update blogger.md
2016-02-06 07:21:42 +07:00
Valmik Jangla
de7e760788
Employees with no attendance show up as blank
2016-02-05 17:46:14 +05:30
Nabin Hait
c2268caaf7
Merge pull request #4740 from vjFaLk/holiday-report-improvements
...
Added From and To date to Holiday Report
2016-02-05 15:13:11 +05:30
Valmik Jangla
235de6566e
Minor fix
2016-02-05 15:07:16 +05:30
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
