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

7407 Commits

Author SHA1 Message Date
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
needed to make GL Entry
 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