Rohit Waghchaure
dd70fbfdae
[fix] Letter head not showing in the report
2017-04-24 18:57:51 +05:30
Manas Solanki
6eaf281b2b
Export and import program enrollments
2017-04-24 18:44:12 +05:30
pawan
134487ab2a
Changes after review
2017-04-24 13:48:40 +05:30
pawan
7bd7df3742
Changes after review
2017-04-24 13:19:22 +05:30
Ishan Loya
56c1b2a625
Make proposed corrections
2017-04-24 10:44:36 +05:30
Ishan Loya
b12e15dcc4
Change modified by
2017-04-24 10:44:36 +05:30
Ishan Loya
e5fdd47fd8
Hide 'Qty Transferred for Manufacturing' field if skip material transfer
2017-04-24 10:44:36 +05:30
Ishan Loya
04c69fb46d
Minor fix
2017-04-24 10:44:36 +05:30
Ishan Loya
f04ef8dfe0
Update documentation for Production Order skipping material transfer entry option
2017-04-24 10:44:36 +05:30
Ishan Loya
7544904857
Add option to skip material transfer for production orders
2017-04-24 10:44:36 +05:30
Rushabh Mehta
c44910370b
[fix] is_sample_item
2017-04-24 10:28:38 +05:30
Rushabh Mehta
551406ab11
[enhance] automatic batch selection in Delivery Note and Stock Entry
2017-04-24 10:28:38 +05:30
Rushabh Mehta
e385b5b97b
[enhance] automatic batch creation, move and split
2017-04-24 10:28:38 +05:30
mbauskar
bb2670d57a
[fixes] minor fixes in bank reconciliation form and report
2017-04-24 10:23:50 +05:30
mbauskar
0b293133be
[minor] fixes for unsupported operand type(s) for +=: 'int' and 'NoneType'
2017-04-21 21:40:30 +05:30
ibi
83c1c3a171
fleet_management: replace references to fleet_management by hr in vehicle_log doctype
2017-04-21 17:57:07 +05:30
mbauskar
c3d642e5d1
[minor] allow bulk edit for doctype
2017-04-21 17:50:40 +05:30
Manas Solanki
8230ce095f
[Fix] fixed routing to the assessment result
2017-04-21 17:49:52 +05:30
Nabin Hait
557847a5ba
bumped to version 8.0.15
2017-04-21 12:19:09 +06:00
mbauskar
9bac58cdc6
[fixes] fixes in setup wizard for education domain
2017-04-21 11:38:28 +05:30
Nabin Hait
9afb53203f
bumped to version 8.0.14
2017-04-20 09:21:44 +06:00
Nabin Hait
825e053e66
Fixed project_copied_from patch
2017-04-20 08:50:37 +05:30
Nabin Hait
e42fb32f6f
Fixed allow_zero_valuation_rate patch
2017-04-20 08:45:18 +05:30
Nabin Hait
68ae9f3f88
Merge branch 'develop' into allow_on_submit_fix
2017-04-19 21:10:23 +05:30
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
2017-04-19 21:05:37 +05:30
mbauskar
9e9d242a24
[minor] fixes in test cases and added the test case for multiple uom in selling
2017-04-19 21:05:37 +05:30
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
Nabin Hait
f382373cf4
Merge branch 'develop' into develop
2017-04-19 21:01:19 +05:30
CH
61f4a8e757
Make the address type translatable in the Address_HTML field
2017-04-19 20:58:53 +05:30
Nabin Hait
eef55185fc
Update purchase_receipt_item.json
2017-04-19 20:58:09 +05:30
Nabin Hait
8691e0777b
Update purchase_invoice_item.json
2017-04-19 20:58:09 +05:30
Nabin Hait
2de3bf7a0f
Fixed indexes on sales and purchase transactions
2017-04-19 20:58:09 +05:30
Julian Robbins
2e6f12b850
Update purchase-details.md
2017-04-19 20:55:04 +05:30
mbauskar
ba41242f1f
[fixes] fixed the pricing rule issue https://github.com/frappe/erpnext/issues/8493
2017-04-19 20:54:23 +05:30
Kanchan Chauhan
0633df5872
Item variant searchable in website products
2017-04-19 20:51:43 +05:30
Rohit Waghchaure
f4f774d1df
[fix] offline_pos_name is not defined during print from the POS
2017-04-19 20:50:35 +05:30
Faris Ansari
695327a513
Duplicate dependencies when project is duplicated
...
- fix frappe/erpnext#8274
2017-04-19 20:48:49 +05:30
Rohit Waghchaure
019501e4a0
[fix] Balance Sheet, linking account to general ledger is not working
2017-04-19 20:46:30 +05:30
Nabin Hait
2704162f5a
Fixes allowd on submit
2017-04-19 16:25:39 +05:30
Nabin Hait
117be7ddd5
Added a settings in Accounts Settings to disable booking depreciation entry automatically
2017-04-18 14:03:06 +05:30
Nabin Hait
8a01980757
Unlink Journal Entry reference from Asset
2017-04-18 13:11:10 +05:30
mbauskar
5123a8519b
[minor] check if joining date is available before validating attandance date
2017-04-18 11:08:57 +05:30
Rohit Waghchaure
d7de3c606b
[fix] Pricing rule for pos
2017-04-17 17:32:36 +05:30
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
Nabin Hait
4d1cf53466
bumped to version 8.0.13
2017-04-17 16:06:58 +06:00
Nabin Hait
e2431fd5e9
minor fix
2017-04-17 15:35:36 +05:30
Nabin Hait
ad65be8250
bumped to version 8.0.12
2017-04-17 15:42:17 +06:00
Manas Solanki
ae30026005
Calender view fix for course schedule
2017-04-17 14:55:54 +05:30
Manas Solanki
54c4240d9c
Changes in the program enrollment
2017-04-17 14:55:54 +05:30
Manas Solanki
79683d0871
Added school setting
2017-04-17 14:55:54 +05:30
Manas Solanki
a6d1876958
Changes in course and program
2017-04-17 14:55:54 +05:30
Manas Solanki
346928f2bc
changes in program enrollment and tool
2017-04-17 14:55:54 +05:30
Nabin Hait
310d238d17
Merge pull request #8460 from rohitwaghchaure/client_followup_report
...
Client followup report
2017-04-17 14:13:38 +05:30
Nabin Hait
5e25731188
Update crm_reports.md
2017-04-17 14:13:20 +05:30
Nabin Hait
83ca262e38
Merge pull request #8453 from StrellaGroup/develop
...
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-17 14:00:12 +05:30
mbauskar
8a2e6f427b
[minor] if address is not found then set the address_field to '' instead of None
2017-04-17 13:58:52 +05:30
Faris Ansari
8371c1c4cd
Text overflow fix for product text in portal
2017-04-17 13:57:19 +05:30
Julian Robbins
361e7f6ddc
Remove typos and use better English
2017-04-17 13:56:53 +05:30
mbauskar
22cedeb006
[minor] POS & RFQ format_number fixes
2017-04-17 12:24:24 +05:30
pawan
83c8ed0827
”[fix]
2017-04-17 01:02:56 +05:30
Rushabh Mehta
e3c117e32c
[fix] validate preferred email if set in employee.py
2017-04-15 16:59:39 +05:30
Nabin Hait
307543f968
bumped to version 8.0.11
2017-04-14 18:02:37 +06:00
Rohit Waghchaure
6681b0d2aa
Documentation
2017-04-14 17:14:03 +05:30
Javier Wong
54d9c9eaf4
Merge branch 'develop' into develop
2017-04-14 18:33:44 +08:00
Javier Wong
9b11d9b45d
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-14 18:24:04 +08:00
mbauskar
cca55ddc33
[minor][hot] fixes for KeyError: from_date for stock balance report
2017-04-14 14:54:11 +05:30
Rohit Waghchaure
1c68509426
[enhance] Report for prospects engaged but not converted
2017-04-14 12:28:59 +05:30
mbauskar
1e05077b1f
[minor] sales register report fixes
2017-04-14 09:59:49 +05:30
joezsweet
b81244342f
Create en-GB.csv
...
- added for compatibility with frappe languages
2017-04-13 19:09:06 +05:30
CH
8e92250798
Correction of issue #8354
2017-04-13 18:59:51 +05:30
CH
d20ec25c92
Removal of double brackets to setup the chart of accounts in the setup wizard
2017-04-13 18:59:06 +05:30
Nabin Hait
25bcb14c1d
Merge pull request #8440 from mbauskar/cart-fixes
...
[minor] fides for add to card button issue
2017-04-13 18:49:22 +05:30
Nabin Hait
f6149f1507
Merge pull request #8429 from ckosiegbu/payroll_updates
...
Statistical Components for Salary Structure
2017-04-13 18:48:47 +05:30
Nabin Hait
2f3585f949
Update salary_slip.js
2017-04-13 18:47:25 +05:30
mbauskar
ed8ad9cfee
[minor] fides for add to card button issue
2017-04-13 18:45:09 +05:30
Nabin Hait
3a2727c9eb
Merge pull request #8430 from mbauskar/stock-entry-supplier-address
...
[minor] fetch supplier address, address_display on supplier trigger
2017-04-13 18:45:09 +05:30
Nabin Hait
16d92e7270
Update update_supplier_address_in_stock_entry.py
2017-04-13 18:44:33 +05:30
Nabin Hait
8c7eb444ef
Merge pull request #8439 from mbauskar/subsciption-fixes
...
[minor] validate email address before get update button click
2017-04-13 18:41:49 +05:30
mbauskar
9a0efc7710
[minor] validate email address before get update button click
2017-04-13 18:18:18 +05:30
mbauskar
3ddfce4f17
[patch] move supplier_address to address_display and set supplier_address in SE
2017-04-13 16:46:41 +05:30
ckosiegbu
a236f4e586
Space to Tabs on salary_slip.py
2017-04-13 10:28:10 +01:00
Nabin Hait
0b62c6ebd4
Merge pull request #8432 from mbauskar/bom-tree-fixes
...
[minor] fixes in bom tree view template
2017-04-13 14:36:45 +05:30
mbauskar
40ca4c3bbb
[minor] fixes in bom tree view template
2017-04-13 14:29:19 +05:30
Nabin Hait
c454dc7af5
Merge pull request #8420 from netchampfaris/pos
...
[POS] Show stock quantity of items
2017-04-13 13:26:58 +05:30
Rushabh Mehta
994cef5ee3
[minor] fix imports in old patches
2017-04-13 13:14:05 +05:30
Faris Ansari
185762aeeb
update label
2017-04-13 12:36:08 +05:30
mbauskar
1b32d913a2
[minor] fetch supplier address, address_display on supplier trigger
2017-04-13 11:55:20 +05:30
ckosiegbu
64f29f819a
Introduce the ability to specify in a Salary Structure that a component is statistical. This allows components to be used in calculations without being added/deducted from earnings deductions.
2017-04-13 00:00:37 +01:00
Nabin Hait
2efe05c1ce
Merge pull request #8263 from frappe/revert-8126-issue8094
...
Revert "Add link field Package Code (fixes #8094 )"
2017-04-12 19:50:43 +05:30
Nabin Hait
a220e96867
bumped to version 8.0.10
2017-04-12 19:30:52 +06:00
mbauskar
e471b02172
[minor] if packed item warehouse not found then set the parent item warehouse to packed items
2017-04-12 18:51:01 +05:30
Faris Ansari
19f90e984e
[POS] Show stock quantity of items
...
- frappe/erpnext#8247
2017-04-12 16:06:31 +05:30
Faris Ansari
b5608f9b14
[fix] Default Print Format for Sales Invoice ( #8419 )
...
- frappe/erpnext#8416
2017-04-12 15:31:01 +05:30
rohitwaghchaure
5adce495aa
Merge pull request #8417 from rohitwaghchaure/due_date_issue
...
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 14:43:21 +05:30
Rushabh Mehta
66272a168d
[minor] README.md + encode query parameter in search
2017-04-12 14:32:07 +05:30
Rohit Waghchaure
2192c244c0
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 13:19:05 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Nabin Hait
d1fda1ff2b
bumped to version 8.0.9
2017-04-11 19:44:12 +06:00
mbauskar
b9d0e7622a
[translation] translation updates for - erpnext on 2017-04-04
2017-04-11 18:57:48 +05:30
mbauskar
2f9703c20e
[minor] set company_currency as account_currency in general ledger if party type is employee
2017-04-11 18:56:41 +05:30
Khairil Zhafri
46b6d4ea47
Update student.json
...
Less binary gender option for Student
2017-04-11 18:55:31 +05:30
Khairil Zhafri
417145bec5
Update employee.json
...
Less binary gender options for Employee
2017-04-11 18:55:20 +05:30
Rohit Waghchaure
1ff1368280
[fix] Vehicle expense report not working
2017-04-11 18:54:32 +05:30
joezsweet
768a888bf2
[fix] validate supplier invoice
...
- modified to check for the selected supplier only
2017-04-11 18:52:46 +05:30
Julian Robbins
8037a0e3d5
Update assignment.md
...
A typo and improvement tom English
2017-04-11 18:51:34 +05:30
mbauskar
0b665ac791
[minor] don't throw error for buying transactions if price list is not selected
2017-04-11 18:51:12 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Kanchan Chauhan
95108ac80b
[Minor] Party validation for Employee
2017-04-11 18:29:27 +05:30
Dominik Ottenbreit
9b9777be3f
Fix mistranslation "Lieferantennauftrag" -> "Bestellung"
...
There is the strange term of "Lieferantenauftrag" that has been used for
"Purchase Order" which translates to "Supplier Order". This is not
standard at all and should be fixed to "Bestellung".
A Google search for "Bestellung" returns 97 million results, a search
for "Lieferantenauftrag" returns 972 results so it should be clear what
is standard.
2017-04-11 18:28:35 +05:30
Nabin Hait
075b299673
bom traversing: argument mutable issue
2017-04-11 18:27:34 +05:30
mbauskar
e0271a8331
[minor] ReferenceError:doc fixes for delivery note
2017-04-11 17:54:22 +05:30
mbauskar
236f7aac7f
[minor] track changes for transaction documents
2017-04-10 14:48:54 +05:30
Manas Solanki
29ee263093
Fix in student attendacne tool
2017-04-10 14:33:35 +05:30
Makarand Bauskar
4782e8b751
[minor] added safe_eval for status_updater and added getdate and nowdate ( #8365 )
2017-04-07 17:16:16 +05:30
Rushabh Mehta
b58979fd3e
[added] frappe.safe_eval
2017-04-06 18:58:39 +05:30
Rushabh Mehta
9365641777
[added] frappe.safe_eval
2017-04-06 18:24:34 +05:30
Nabin Hait
0d230afd22
bumped to version 8.0.8
2017-04-06 17:02:03 +06:00
Makis Etzoglou
a906b3f11c
add delivery date to print format Fix #8111
2017-04-06 15:47:52 +05:30
Kanchan Chauhan
aa6f00c403
Added default 'All' option to filters to differentiate all and empty filter
2017-04-06 15:22:18 +05:30
Nabin Hait
d681c88d79
validate returned qty only if there is reference qty
2017-04-06 15:20:45 +05:30
Javier Wong
fc11fce990
[enhancement] Changed Issue Description and Resolution to Text Editor ( #8346 )
2017-04-06 14:56:44 +05:30
Rohit Waghchaure
faf51d91b6
[fix] stock qty issue in purchase trends report
2017-04-05 14:53:26 +05:30
Rushabh Mehta
08a42e00ae
[fix] salary slip eval, remove access to globals, #8313
2017-04-05 14:52:22 +05:30
Nabin Hait
549a2827e5
Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8
...
[fix] Customer edit issue in offline POS
2017-04-05 14:51:44 +05:30
Rushabh Mehta
9264313f0e
[fix] ordering for Edit Posting Time check
2017-04-05 12:49:01 +05:30
Nabin Hait
8013d1813a
Merge pull request #8320 from manassolanki/newsl
...
Route to newsletter listview
2017-04-05 12:33:14 +05:30
Rushabh Mehta
ffc807cd57
[minor] check below posting date in delivery note
2017-04-05 12:27:41 +05:30
Manas Solanki
ba6559c2e9
Route to newsletter listview
2017-04-05 11:52:23 +05:30
Nabin Hait
93a990f006
bumped to version 8.0.7
2017-04-04 12:16:47 +06:00
Rohit Waghchaure
2861955632
[fix] Customer edit issue in offline POS
2017-04-04 09:59:29 +05:30
Faris Ansari
0d114b4c31
Add image field to fetch in Customer List
2017-04-03 21:21:50 +05:30
Nabin Hait
fcf34dc570
Merge pull request #8295 from saurabh6790/demo_fix
...
[fix] demo script for setup data
2017-04-03 17:56:47 +05:30
Nabin Hait
6f038bc1f3
Validate total advance against grand total considering write off amount
2017-04-03 17:56:05 +05:30
Nabin Hait
9300013acc
Validate total advance against grand total considering write off amount
2017-04-03 17:35:58 +05:30
Nabin Hait
8d8cba7faa
Validate total advance against grand total considering write off amount
2017-04-03 17:26:32 +05:30
Nabin Hait
2d132e32aa
Function name changed in company
2017-04-03 17:26:32 +05:30
Saurabh
2e47654f43
[fix] demo script for setup data
2017-04-03 17:25:55 +05:30
Nabin Hait
17ddd8f389
bumped to version 8.0.6
2017-04-03 13:48:13 +06:00
Nabin Hait
c469f2c954
Get POS profile fix
2017-04-03 13:01:11 +05:30
Nabin Hait
731efe3a95
Minor fix in gross profit report
2017-04-03 12:11:36 +05:30
Nabin Hait
2c892c7e7f
Indentation fixed in gross profit report
2017-04-03 12:05:35 +05:30
Nabin Hait
31334328ed
bumped to version 8.0.5
2017-04-01 19:32:55 +06:00
Rushabh Mehta
0d6db6c42c
[fix] add user default role
2017-03-31 23:02:19 +05:30
Nabin Hait
d991c8666c
bumped to version 8.0.4
2017-03-31 18:49:57 +06:00
Nabin Hait
85d1c07519
Merge pull request #8269 from rohitwaghchaure/v8_documentation
...
[Documentation] Added for custom roles for page and report, fixed some broken images
2017-03-31 18:04:44 +05:30
Nabin Hait
04ab7dfd2f
Update role-permisison-for-page-and-report.md
2017-03-31 18:04:15 +05:30
Faris Ansari
eae30e5642
[fix] Show project title in kanban view ( #8268 )
...
- frappe/erpnext#8232
2017-03-31 17:46:12 +05:30
Nabin Hait
065302298f
Merge pull request #8261 from rohitwaghchaure/pull_project_from_bom_to_po
...
[enhance] Get project from bom on production order
2017-03-31 17:40:43 +05:30
Nabin Hait
b15d999147
Merge branch 'develop' into gross_profit_issue_v_8
2017-03-31 17:39:45 +05:30
Rushabh Mehta
4b0381c820
[fix] tests
2017-03-31 17:36:48 +05:30
Rushabh Mehta
f0b4562a95
[refactor] move purchase_common.js -> public/js/controllers/buying.js
2017-03-31 17:36:48 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Rohit Waghchaure
67a3e65f08
[Documentation] Added for custom roles for page and report, fixed some broken images
2017-03-31 17:22:58 +05:30
Rushabh Mehta
dc89916aa9
[fix] salary component fix for abbr
2017-03-31 17:20:57 +05:30
Rushabh Mehta
9d9cb8b7b1
Revert "Add link field Package Code ( fixes #8094 )"
2017-03-31 14:35:23 +05:30
Rohit Waghchaure
e7c0188732
[enhance] Get project from bom on production order
2017-03-31 13:40:06 +05:30
Rohit Waghchaure
34b1dba9aa
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
2017-03-31 12:44:10 +05:30
Nabin Hait
c040015bb5
Used db_update in patch to bypass validate and on_update method
2017-03-31 11:58:19 +05:30
Rushabh Mehta
b66edd19ca
[minor] refactor transaction.js
2017-03-31 10:50:58 +05:30
Ricardo Johann
033e2fa8b6
changed accumulated header
2017-03-31 02:18:54 -03:00
Nabin Hait
79fddcfac1
bumped to version 8.0.3
2017-03-31 00:20:27 +06:00
Revant Nandgaonkar
3d5bdeb90d
[Fix] patch v7_2.contact_address_links
2017-03-30 23:14:58 +05:30
Revant Nandgaonkar
d07c041125
[Fix] Addresses linked back to Lead
2017-03-30 23:14:58 +05:30
Nabin Hait
b207a0542a
bumped to version 8.0.2
2017-03-30 20:22:42 +06:00
Nabin Hait
620bde7144
Updated modified date to reload sales uom
2017-03-30 19:50:45 +05:30
Nabin Hait
896fd1aca7
bumped to version 8.0.1
2017-03-30 20:05:51 +06:00
Nabin Hait
e503f68ec7
Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue
...
[fix] POS cart item's highlighted issue
2017-03-30 19:26:33 +05:30
Rohit Waghchaure
a86bb69adf
[fix] POS cart item's highlighted issue
2017-03-30 19:16:38 +05:30
Nabin Hait
3b5b081ac4
bumped to version 8.0.0
2017-03-30 18:58:20 +06:00
Nabin Hait
d00218ece3
Merge pull request #8227 from manassolanki/contact_report
...
Addition of few more fields in student contact report
2017-03-30 17:43:33 +05:30
Nabin Hait
93c15383b8
[translations]
2017-03-30 16:57:19 +05:30
Nabin Hait
3c2be33adf
Merge pull request #8226 from mbauskar/item-varient-fix
...
[minor] make varient fixes in item.js
2017-03-30 16:05:34 +05:30
Manas Solanki
4be52d8a20
Addition of few more fields in student contact report
2017-03-30 16:04:26 +05:30
Nabin Hait
6bd791742f
Change log for version 8
2017-03-30 16:00:43 +05:30
mbauskar
90d82be966
[minor] make varient fixes in item.js
2017-03-30 15:36:46 +05:30
Nabin Hait
eb6fa5b70c
Update attendance.py
2017-03-30 14:11:47 +05:30
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Nabin Hait
a9bef56a94
bumped to version 7.2.32
2017-03-30 13:44:34 +06:00
Nabin Hait
a24f8dbb8f
Merge branch 'develop' into update-disbursment-date
2017-03-30 13:06:28 +05:30
Kanchan Chauhan
37d8f643cc
Read permissions to Employee on Employee Loan and Loan Type
2017-03-30 13:05:49 +05:30
Kanchan Chauhan
400c6f5aef
Disbursement Date fetched from JV - Employee Loan
2017-03-30 13:04:05 +05:30
mbauskar
07e6bdd4f2
[minor] check employee date of joining before marking the employee attendance
2017-03-30 12:52:29 +05:30
Kanchan Chauhan
b87c174898
Employee Loan Dashboard
2017-03-30 12:51:46 +05:30
CH
99752e58ec
VAT rates update for France
2017-03-30 12:45:08 +05:30
Kanchan Chauhan
5ac740b3cb
[Fix] From Date and To Date not to be auto calculated for Timesheet Salary
2017-03-30 12:44:28 +05:30
Manas Solanki
3528d08178
[Fix] Fix in program enrollment tool and report
2017-03-30 12:21:49 +05:30
Nabin Hait
f912317fae
Stock Balance: Show records based on all child item groups if filters set based on group node
2017-03-29 18:08:10 +05:30
Nabin Hait
e2fef16d78
Made join_table query optional based on item group filter
2017-03-29 17:51:05 +05:30
Javier Wong
41bf1ba7b3
[enhancement] Stock Balance Report - Added Item Group Filter
2017-03-29 17:51:05 +05:30
Ricardo Johann
3d1434afe7
Export total labels
2017-03-29 17:44:17 +05:30
addymuliady
0dd00eb418
Update accounts-settings.md
2017-03-29 17:40:01 +05:30
Nabin Hait
64e9c4abf4
Changed label of hide_tax_id field
2017-03-29 17:39:08 +05:30
Makis Etzoglou
82e6bc45e4
tax_id add to Sales Order, Delivery Note, and Sales Invoice
2017-03-29 17:39:08 +05:30
Saurabh
a5ddeb44e7
[fix] remove integraton service reference from documentation
2017-03-29 17:32:04 +05:30
Kanchan Chauhan
35b12e2ea6
Company in Leave Control Panel
2017-03-29 17:30:56 +05:30
mbauskar
de98ff6bb9
[minor] hide the stock details section if update_stock is unchecked
2017-03-29 17:29:58 +05:30
rohitwaghchaure
afa93c624b
[fix] Reserved qty is not calculating properly in BIN for multi sales UOM ( #8203 )
2017-03-29 17:29:20 +05:30
Manas Solanki
8519b4bfe4
Changes in Program Enrollment and Report for Student Contact Details ( #8176 )
...
* Added the student house name in the program enrollment
* added report for the student contact details
* Enabled tag in Student master and fix in student enrollment tool
* [Fix] School House and Report
2017-03-29 16:07:31 +05:30
Nabin Hait
79731360ed
Merge pull request #8126 from kickapoo/issue8094
...
Add link field Package Code (fixes #8094 )
2017-03-28 20:48:39 +05:30
Nabin Hait
fede6d8fbe
Updated modified date for production order
2017-03-28 20:42:42 +05:30
Stavros Anastasiadis
b9bbb3c3db
Add link field Package Code ( fixes #8093 )
2017-03-28 16:09:52 +03:00
Neil Trini Lasrado
193c8919b9
Fixed issue with misleading error message on Stock Entry creation of Serialized Items
2017-03-28 17:43:23 +05:30
Nabin Hait
d1f6cc88f2
Required items table in Production order
2017-03-28 17:08:40 +05:30
Nabin Hait
dac525433c
Merge pull request #8178 from nabinhait/develop
...
Patch order changed for multiple uoms in sales cycle
2017-03-28 16:55:57 +05:30
Faris Ansari
49a3d6d8f6
Update POS screenshot
2017-03-28 16:17:30 +05:30
Nabin Hait
6c3eb36c35
Merge branch 'develop' into customs_tariff_number
2017-03-28 13:51:44 +05:30
Nabin Hait
da749f716b
Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue
...
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 13:49:32 +05:30
Nabin Hait
2cf5ca28f6
Merge pull request #8173 from nabinhait/hotfix
...
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 13:49:09 +05:30
Nabin Hait
621dcc3c84
Patch order changed for multiple uoms in sales cycle
2017-03-28 13:45:56 +05:30
Nabin Hait
77b2fef41e
Fixed test cases
2017-03-28 13:39:26 +05:30
Nabin Hait
d20f8585ae
Merge branch 'manufacturer_childtable' of https://github.com/dottenbr/erpnext into dottenbr-manufacturer_childtable
2017-03-28 13:31:28 +05:30
Rohit Waghchaure
d7908f8e3a
[fix] sales order with status closed fetching on production planning tool
2017-03-28 12:30:23 +05:30
Nabin Hait
77c970549b
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 12:20:31 +05:30
Rohit Waghchaure
5ecbaa408b
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 12:09:07 +05:30
Nabin Hait
0329c0ffab
Test case fixed for production order
2017-03-27 19:11:45 +05:30
Nabin Hait
5b60ef2dce
Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked
2017-03-27 16:29:51 +05:30
Nabin Hait
8bf58367b8
Fixed merge conflict
2017-03-27 12:30:01 +05:30
Nabin Hait
70c3f79d12
bumped to version 7.2.31
2017-03-27 12:57:38 +06:00
Nabin Hait
9c8159be8f
Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue
...
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
2017-03-27 12:25:18 +05:30
Nabin Hait
68fb20b811
Merge pull request #8131 from rohitwaghchaure/purchase_analytics_issue
...
[fix] Purchase analytics report not loading
2017-03-27 12:24:46 +05:30
Dominik Ottenbreit
fc9ed4da24
Add Customs Tariff Number
2017-03-24 15:53:03 +01:00
Dominik Ottenbreit
ea617da277
fix translations that have to do with term 'close' which was not well translated
2017-03-24 15:24:55 +01:00
Dominik Ottenbreit
6eb202ef3a
fix patch after test, fix variant based on manufacturer, add json for item_manufacturer
2017-03-24 14:49:52 +01:00
Dominik Ottenbreit
3938c61996
migrate from manufacturer to manufacturer childtable
2017-03-24 14:24:34 +01:00
Rohit Waghchaure
f74b02140c
[fix] Purchase analytics report not loading
2017-03-24 17:37:02 +05:30
Rohit Waghchaure
b719dc53fc
[fix] customer edit and numeric keypad visibility issue in the pos
2017-03-24 17:03:50 +05:30
Nabin Hait
00b04ed61e
Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart
...
Show qty in Shopping Cart
2017-03-24 13:14:03 +05:30
Nabin Hait
bf2a7efca4
Account name changed in standard chart of accounts
2017-03-24 13:01:35 +05:30
Nabin Hait
214ea8f2c8
Merge pull request #8119 from robulik/develop
...
[minor] fixes of translatable strings in web pages
2017-03-24 12:59:02 +05:30
Kanchan Chauhan
a844040781
Show qty in Shopping Cart
2017-03-23 18:22:02 +05:30
Robert Kirschner
b8f5148a44
[minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type
2017-03-23 13:43:26 +01:00
Nabin Hait
9ba1be60b7
Merge pull request #8039 from netchampfaris/pos-ui-fix
...
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-23 17:14:39 +05:30
Nabin Hait
2aafdd622b
Merge pull request #8047 from KanchanChauhan/warehouse-for-dropship
...
[Fix] Warehouse not required for Dropship
2017-03-23 17:06:18 +05:30
Nabin Hait
b6b97f25d0
Merge pull request #8048 from KanchanChauhan/bom-based-on-project
...
Project filter in BOM selection in Production Order
2017-03-23 17:04:53 +05:30
Nabin Hait
4a8a62a202
Merge pull request #8053 from umairsy/video-pages
...
updated erpnext-learn pages
2017-03-23 17:02:34 +05:30
Nabin Hait
d25e314ccb
Merge pull request #8054 from rohitwaghchaure/purchase_return_issue_invoice
...
[fix] Quantity is not copying in the Received Qty during making of debit note from the purchase invoice
2017-03-23 17:01:58 +05:30
Nabin Hait
f44f04e33a
Merge pull request #8063 from khrlzhfr/patch-1
...
Update standard_chart_of_accounts.py
2017-03-23 17:01:34 +05:30
Robert Kirschner
db068ac6c4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-03-23 12:29:43 +01:00
Nabin Hait
c7dc838306
Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue
...
[fix] Precision issue during making of depreciation schedule
2017-03-23 16:59:12 +05:30
Nabin Hait
5168286ea0
Merge pull request #8072 from lb-/patch-1
...
Update the-champion.md - grammar
2017-03-23 16:58:19 +05:30
Nabin Hait
8373b8e50d
Merge pull request #8075 from netchampfaris/asset-image-fix
...
[fix] asset image in image view
2017-03-23 16:58:05 +05:30
Nabin Hait
33f2b659e4
Merge pull request #8079 from robulik/develop
...
[fix] selecting new address in cart webpage unchecks previously checked
2017-03-23 16:52:39 +05:30
Nabin Hait
8de911b5b4
Merge pull request #8086 from KanchanChauhan/read-perm-to-guest
...
[Minor] Guest should have read permissions on Job Openings
2017-03-23 16:50:45 +05:30
Robert Kirschner
d162eb367c
[minor] fix translation strings in cart web view
2017-03-23 12:18:24 +01:00
Robert Kirschner
0af93a782d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-03-23 12:10:46 +01:00
Nabin Hait
46bccb55c5
Merge pull request #8080 from rmehta/item-variants-by-mfg
...
[feature] ability to have variants based on manufacturer
2017-03-23 16:29:41 +05:30
Nabin Hait
422ef584fa
Merge pull request #8090 from KanchanChauhan/date-span-in-salary-slip
...
[Minor] From date, To date based on Payroll Frequency
2017-03-23 16:16:51 +05:30
Nabin Hait
b132428184
Merge pull request #8091 from mbauskar/cart-address-fixes
...
[minor] fixed shipping and billing address issue in cart
2017-03-23 16:16:11 +05:30
Rohit Waghchaure
57f35a25a1
[fix] UnpickleError, removed _ method from the argument of the function
2017-03-23 14:55:52 +05:30
Faris Ansari
3011006ff2
Merge pull request #8097 from frappe/netchampfaris-documentation-1
...
Add new screenshots for Workflows documentation
2017-03-22 17:50:17 +05:30
Faris Ansari
1e7f739c84
Add new screenshots for Workflows documentation
2017-03-22 17:48:51 +05:30
Faris Ansari
7fbc1c2161
Update Workflows
...
Add new images
2017-03-22 17:45:52 +05:30
mbauskar
67e3e32dd6
[minor] fixed shipping and billing address issue in cart
2017-03-22 16:14:43 +05:30
Kanchan Chauhan
076e9d6af8
[Minor] From date, To date based on Payroll Frequency
2017-03-22 16:07:03 +05:30
Robert Kirschner
c6b52a321e
update on cart.js pull request feedback
2017-03-22 08:10:30 +01:00
Kanchan Chauhan
730ad5a507
[Minor] Guest should have read permissions on Job Openings
2017-03-22 12:37:38 +05:30
Rushabh Mehta
43583d6497
Update item.js
2017-03-21 17:49:53 +01:00
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
Robert Kirschner
0a33d4ffc5
[fix] selecting new address in cart web page unchecks previously checked address
2017-03-21 14:52:59 +01:00
Rohit Waghchaure
6ee91ec9c6
on selection of row highlight the background in the cart
2017-03-21 15:55:09 +05:30
Faris Ansari
e1acb766ac
[fix] asset image in image view
2017-03-21 14:18:30 +05:30
LB (Ben Johnston)
71f4fbf467
Update the-champion.md - grammar
2017-03-21 12:50:17 +07:00
Rohit Waghchaure
b69d311268
[fix] precision issue during making of depreciation schedule
2017-03-20 16:30:34 +05:30
Khairil Zhafri
4d6d456a0d
Update standard_chart_of_accounts.py
...
Minor spelling edits
2017-03-20 00:15:34 +08:00
Rohit Waghchaure
414c0ab3bb
[fix] Quantity is not copying in the Received Qty during making of debit note
2017-03-17 17:19:17 +05:30
Umair Sayyed
024896d806
updated erpnext-learn pages
2017-03-17 12:55:01 +05:30
rohitwaghchaure
2b9c95a940
Merge pull request #8043 from rohitwaghchaure/pos_issue_v8
...
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 17:56:20 +05:30
Kanchan Chauhan
7cf1a1d84b
Project filter in BOM selection in Production Order
2017-03-16 17:09:37 +05:30
Kanchan Chauhan
6f7457a1b0
[Fix] Warehouse not required for Dropship
2017-03-16 16:03:41 +05:30
Rohit Waghchaure
75177c0e35
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 15:47:25 +05:30
Faris Ansari
d79f239001
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-16 12:18:35 +05:30
mbauskar
27efc91db0
[minor] make item code mandatory if update_stock is selected
2017-03-15 18:57:18 +05:30
Manas Solanki
ad2dc2c747
[Fix] Enrolling the student
2017-03-15 18:22:57 +05:30
Rushabh Mehta
f340e19ea7
[minor] field re-arrangements in sales invoice, purchase invoice, stock reco
2017-03-15 15:12:43 +05:30
Nabin Hait
56f650f342
Merge branch 'master' into develop
2017-03-15 11:28:07 +05:30
Nabin Hait
1157ee365b
bumped to version 7.2.30
2017-03-15 11:58:06 +06:00
Nabin Hait
ee7b4f2882
Merge pull request #8016 from rmehta/posting-date-option
...
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
Nabin Hait
505ed25f10
Merge pull request #8017 from nabinhait/develop
...
Field order changed for 'Qty as per Stock UOM'
2017-03-14 22:39:36 +05:30
Nabin Hait
1ba71a0b3a
Merge pull request #8018 from mbauskar/develop
...
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 22:39:26 +05:30
Nabin Hait
79bce2a71d
Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue
...
[fix] User sales one serial number multiple time from the POS
2017-03-14 22:38:28 +05:30
Rushabh Mehta
4f3da42b75
[fixes] for tests
2017-03-14 21:29:55 +05:30
Rushabh Mehta
131866a11a
[fixes] for tests
2017-03-14 21:06:15 +05:30
Rushabh Mehta
82c258948d
[fixes] for recurring and tests
2017-03-14 19:13:39 +05:30
Rohit Waghchaure
e259a9b068
[fix] User sales one serial number multiple time from the POS
2017-03-14 19:05:21 +05:30
mbauskar
f54b1047b8
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 17:57:47 +05:30
Nabin Hait
3d731df7e3
Field order changed for 'Qty as per Stock UOM'
2017-03-14 17:24:57 +05:30
Rushabh Mehta
f6dee248ee
Update company.json
2017-03-14 17:10:01 +05:30
Rushabh Mehta
6d4a52562b
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
faedf8274c
[fix] gross profit permission issue
2017-03-14 14:56:24 +05:30
Nabin Hait
6a053a989e
Merge pull request #8014 from rohitwaghchaure/contact_issue_for_website_generator
...
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 14:46:48 +05:30
Saurabh
0d47d51407
[fix] modified payment request to cope with new payment structure ( #7957 )
...
* [fix] modified payment request to cope with new payment structure
* [fix] moved payment gateway doctype from accounts to core
2017-03-14 14:46:05 +05:30
Rohit Waghchaure
11fa7a9311
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 13:26:10 +05:30
Manas Solanki
2922660b34
[Fix] Student attendance tool- Handling double-click on button
2017-03-14 12:50:58 +05:30
rohitwaghchaure
27e86201fc
Merge pull request #8007 from rohitwaghchaure/pos_profile_issue
...
[fix] Value assignment issue for country field in pos profile
2017-03-14 00:22:23 +05:30
Rohit Waghchaure
cc034a8983
[fix] Value assignment issue for country in the pos profile
2017-03-13 22:44:48 +05:30
rohitwaghchaure
0216f6e6eb
Merge pull request #7995 from saurabh6790/restrict_negative_qty_in_pr
...
[fix] validate negative quantity while creating purchase receipt
2017-03-13 18:24:24 +05:30
Nabin Hait
26ed675240
Merge pull request #7996 from netchampfaris/ui-fixes
...
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 17:22:56 +05:30
Saurabh
4f4d0a8369
[fix] validate negative quantity while creating purchase receipt
2017-03-13 15:37:47 +05:30
Faris Ansari
df65d21225
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 14:52:56 +05:30
