Neil Trini Lasrado
|
c7f53ff318
|
Added Project filter to Production Planning Tool
|
2016-03-21 12:40:42 +05:30 |
|
rohitwaghchaure
|
49ccac5d95
|
[formatting] Added between in trends.py
|
2016-03-21 12:31:41 +05:30 |
|
Rushabh Mehta
|
98122a2574
|
Merge pull request #5013 from agusputra/patch-25
Update allow-over-delivery-billing-against-sales-order-upto-certain-l…
|
2016-03-21 12:22:01 +05:30 |
|
Rushabh Mehta
|
ea768ec132
|
Merge pull request #5019 from saurabh6790/supp1.0
[fixes] set todays date on employee attendance tool
|
2016-03-21 12:06:01 +05:30 |
|
Nabin Hait
|
68a628ea1e
|
[fix] set recurring id after saving
|
2016-03-21 12:03:30 +05:30 |
|
Saurabh
|
6a277e244c
|
[fixes] set todays date on employee attendance tool
|
2016-03-20 19:00:26 +05:30 |
|
Agus Syahputra
|
383b13cdb5
|
Update allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
|
2016-03-19 08:31:50 +07:00 |
|
Nabin Hait
|
6d27470401
|
bumped to version 6.27.1
|
2016-03-18 17:06:40 +06:00 |
|
Nabin Hait
|
3f11f0ae44
|
Merge pull request #5010 from rohitwaghchaure/support_week_14_03_5
[Enhancement]Fetch default letter head of company on salary structure and salary slip
|
2016-03-18 16:35:14 +05:30 |
|
rohitwaghchaure
|
277b7fa641
|
[Enhancement]Fetch default letter head of company on salary structure and salary slip
|
2016-03-18 16:33:18 +05:30 |
|
Nabin Hait
|
9a75530c26
|
[fix] reload doctype for renaming project
|
2016-03-18 16:19:25 +05:30 |
|
rohitwaghchaure
|
cef1086441
|
[fix]Letterhead not being changed with change in company
|
2016-03-18 15:37:24 +05:30 |
|
Nabin Hait
|
d6c59656e8
|
Merge pull request #5009 from saurabh6790/cart_fixes-1.0
[fixes] return debtors account name
|
2016-03-18 15:36:06 +05:30 |
|
Nabin Hait
|
5996b2f1bb
|
[fix] recurring document logic
|
2016-03-18 15:19:54 +05:30 |
|
Saurabh
|
b43df36e85
|
[fixes] return debtors account name
|
2016-03-18 15:05:50 +05:30 |
|
rohitwaghchaure
|
90ff509f6d
|
[fix]Earlier recurring billing
|
2016-03-18 10:44:53 +05:30 |
|
rohitwaghchaure
|
5b9d517d04
|
[fix]Fiscal year removed from trends report
|
2016-03-17 22:46:09 +05:30 |
|
Nabin Hait
|
eba2c4323e
|
bumped to version 6.27.0
|
2016-03-17 20:01:45 +06:00 |
|
Nabin Hait
|
1ecd8cdaa3
|
[change-log]
|
2016-03-17 19:26:29 +05:30 |
|
Nabin Hait
|
24f1c50dca
|
Create sample Material Requests via setup wizard only if warehouse exists
|
2016-03-17 19:14:53 +05:30 |
|
Nabin Hait
|
4f01704234
|
[fix] Fetch shipping address only if field exists
|
2016-03-17 19:14:53 +05:30 |
|
Nabin Hait
|
547d223b28
|
Merge pull request #4979 from vjFaLk/leave-improvements
Improved Leave Application / Approver feature
|
2016-03-17 19:06:06 +05:30 |
|
Nabin Hait
|
2e08e3e186
|
Merge pull request #4991 from neilLasrado/develop
Fixed Production Planning Tool
|
2016-03-17 19:05:09 +05:30 |
|
Nabin Hait
|
4e78cee1c2
|
Merge pull request #4959 from ShashaQin/patch-37
Improvements about Item Prices Report
|
2016-03-17 18:13:09 +05:30 |
|
Nabin Hait
|
2ed8f8f099
|
[fix] BOM Browser
|
2016-03-17 15:55:48 +05:30 |
|
Nabin Hait
|
cf8fd6274d
|
Merge pull request #4994 from umairsy/report-fix
fixes in the Account Receivable print format - with Nabin
|
2016-03-17 15:53:26 +05:30 |
|
Rushabh Mehta
|
813b9efe28
|
[fix] [minor] address.py
|
2016-03-17 15:36:30 +05:30 |
|
Umair Sayyed
|
8cbc076dc2
|
fixes in the Account Receivale print format - with Nabin
|
2016-03-17 15:12:31 +05:30 |
|
Valmik Jangla
|
15343be386
|
Commonified functions for retrieving Leave Approvers
|
2016-03-17 11:47:30 +05:30 |
|
Valmik Jangla
|
33cc081c3b
|
Improved Leave Application / Approver feature
|
2016-03-17 11:47:30 +05:30 |
|
Kanchan Chauhan
|
b3fe6a45a7
|
WIP Collaborative Project Management first commit
|
2016-03-16 18:34:33 +05:30 |
|
Nabin Hait
|
6221117069
|
[fix] shipping address position in document
|
2016-03-16 16:23:30 +05:30 |
|
Nabin Hait
|
cd6c09fbee
|
[fix] shipping address in purchasee cycle
|
2016-03-16 16:23:30 +05:30 |
|
Saurabh
|
0f063a5f46
|
[patch] map customer_address to shipping_address and customer_address_display to shipping_address_display
|
2016-03-16 16:23:30 +05:30 |
|
Saurabh
|
14d646f636
|
[fixes] shipping address on purchase flow
|
2016-03-16 16:23:30 +05:30 |
|
shreyas
|
7e2d7e88a6
|
[Partial]Some more changes to enable shipping address to be displayed in PO
|
2016-03-16 16:23:30 +05:30 |
|
shreyas
|
26bb6f37bc
|
[Partial] Fix to add Shipping address in Purchase order
|
2016-03-16 16:23:29 +05:30 |
|
shreyas
|
77d23824df
|
[Partial]Some more changes to enable shipping address to be displayed in PO
|
2016-03-16 16:23:29 +05:30 |
|
shreyas
|
22d26a1d82
|
[Partial] Fix to add Shipping address in Purchase order
|
2016-03-16 16:23:29 +05:30 |
|
Nabin Hait
|
91a69e4a8d
|
Merge pull request #4992 from neilLasrado/project-rename
Fixed bug while selecting project in sales_invoice, sales_order, deli…
|
2016-03-16 16:03:18 +05:30 |
|
Neil Trini Lasrado
|
f433a5a124
|
Fixed bug while selecting project in sales_invoice, sales_order, delivery_note
|
2016-03-16 16:00:27 +05:30 |
|
Neil Trini Lasrado
|
41380dfad8
|
Fixed Production Planning Tool
|
2016-03-16 15:26:01 +05:30 |
|
Nabin Hait
|
2a5c1138a0
|
Merge pull request #4944 from rmehta/modules-redesign
[redesign] modules
|
2016-03-16 14:35:11 +05:30 |
|
ShashaQin
|
769b01e07a
|
Update item_prices.py
|
2016-03-16 16:37:28 +08:00 |
|
Nabin Hait
|
fc827b329e
|
Merge pull request #4932 from ci2014/patch-2
Update purchase-return.md
|
2016-03-16 12:33:33 +05:30 |
|
Nabin Hait
|
1f11b96533
|
Merge pull request #4931 from ci2014/patch-1
Update sales-return.md
|
2016-03-16 12:32:42 +05:30 |
|
Nabin Hait
|
a61930e7a7
|
[fix] reload doctype forcefully to rename project field
|
2016-03-16 12:29:32 +05:30 |
|
Nabin Hait
|
22d4a7e742
|
Merge branch 'prod-order' of https://github.com/neilLasrado/erpnext into neilLasrado-prod-order
|
2016-03-16 12:18:01 +05:30 |
|
Nabin Hait
|
df4deba515
|
minor fix
|
2016-03-16 11:16:31 +05:30 |
|
Neil Trini Lasrado
|
6e343e23d9
|
Renamed project_name to project
|
2016-03-15 17:50:53 +05:30 |
|
Nabin Hait
|
d0723f8a96
|
bumped to version 6.26.0
|
2016-03-15 17:13:05 +06:00 |
|
Nabin Hait
|
2ecf239925
|
[change-log]
|
2016-03-15 16:26:36 +05:30 |
|
Nabin Hait
|
29b01226ea
|
[translations]
|
2016-03-15 16:17:21 +05:30 |
|
Nabin Hait
|
f853a92676
|
Fixes in AR/AP Print Format
|
2016-03-15 16:10:15 +05:30 |
|
Nabin Hait
|
89301863e5
|
minot fixes
|
2016-03-15 15:20:49 +05:30 |
|
Nabin Hait
|
6c3cc3647b
|
Merge pull request #4969 from rmehta/link-count
[enhancement] sort links on basis of link_count (idx)
|
2016-03-15 11:40:18 +05:30 |
|
Nabin Hait
|
b9126317b3
|
Merge pull request #4981 from umairsy/march1
updated manual
|
2016-03-15 11:39:29 +05:30 |
|
rohitwaghchaure
|
986616f8ee
|
[fixes]draft BOM showing in Material Request
|
2016-03-14 19:33:30 +05:30 |
|
Umair Sayyed
|
d3ed3638cf
|
updated manual
|
2016-03-14 19:28:53 +05:30 |
|
Nabin Hait
|
5fc9552d29
|
Merge pull request #4980 from rohitwaghchaure/support_week_14_03
[fixes]Unable set recurring date in sales order
|
2016-03-14 19:20:13 +05:30 |
|
Nabin Hait
|
b1f0a7d52e
|
Merge pull request #4876 from saurabh6790/valuation_rate_on_so
[enhancement] get valuation rate and gross profit on sales order item
|
2016-03-14 19:18:58 +05:30 |
|
rohitwaghchaure
|
c54b805981
|
[fixes]Unable set recurring date in sales order
|
2016-03-14 19:03:22 +05:30 |
|
Nabin Hait
|
a098b4178a
|
Merge pull request #4976 from saurabh6790/pr_from_si
[fixes] set amount in PR by checking party_account_currency field
|
2016-03-14 19:01:07 +05:30 |
|
Nabin Hait
|
c2f973b521
|
Merge pull request #4977 from nabinhait/fix88
[fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000
|
2016-03-14 19:00:42 +05:30 |
|
Anand Doshi
|
ad61a28730
|
[fix] [hot] compact print: check in_format_data for print format builder prints
|
2016-03-14 18:20:48 +05:30 |
|
rohitwaghchaure
|
bea7558908
|
[fixes]indicator in material request item
|
2016-03-14 17:47:36 +05:30 |
|
Nabin Hait
|
aa7e17cd80
|
Merge pull request #4970 from nabinhait/fix77
[fix] delete company transactions
|
2016-03-14 16:36:51 +05:30 |
|
Saurabh
|
c54619570a
|
[fixes] check party_account_currency while creating Pull Request from Sales Invoice
|
2016-03-14 15:55:23 +05:30 |
|
Nabin Hait
|
d1f85c4fe6
|
[fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000
|
2016-03-14 14:59:21 +05:30 |
|
Saurabh
|
9f94266892
|
[fixes] fetch value from grand total field while creating payment request from si
|
2016-03-14 11:23:03 +05:30 |
|
Anand Doshi
|
01a8473996
|
[fix] [docs] removed contents.md
|
2016-03-12 00:08:38 +05:30 |
|
Anand Doshi
|
f319206d22
|
[fix] [hot] reload doctype Holiday List
|
2016-03-11 19:45:28 +05:30 |
|
Nabin Hait
|
653f68d2e4
|
[fix] delete company transactions
|
2016-03-11 17:36:57 +05:30 |
|
Anand Doshi
|
4284fcf2a6
|
[fix] additional fixes for removal of Fiscal Year form Holiday List
|
2016-03-11 17:16:30 +05:30 |
|
ci2014
|
73db44d0b9
|
Update purchase-return.md
Added back {next}
|
2016-03-11 11:27:17 +01:00 |
|
Valmik Jangla
|
e2b8af16ed
|
Fixed Salary Slip to work with new Holiday List
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
ba54a43e32
|
Fixed Maintenance Schedule to work wit new Holiday List
Improved code in Holiday List for speed
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
3427c939bd
|
Removed unused code
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
c666030f34
|
Get Weekly Off dates now gets dates dynamically
Fixed Holiday List test records
|
2016-03-11 14:58:55 +05:30 |
|
Valmik Jangla
|
3085186182
|
Removed Fiscal Year from Holiday List and Calendar
|
2016-03-11 14:58:55 +05:30 |
|
Anand Doshi
|
c75c1d7e3e
|
[fix] additional fixes after deprecating Fiscal Year
|
2016-03-11 14:56:19 +05:30 |
|
Rushabh Mehta
|
3574b37ff3
|
[enhancement] sort links on basis of link_count (idx)
|
2016-03-11 14:33:04 +05:30 |
|
Valmik Jangla
|
d9cc14ddd5
|
Removed from Leave Block List and Monthly Attendance List
|
2016-03-11 13:07:49 +05:30 |
|
Valmik Jangla
|
13bb2ba779
|
Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance
|
2016-03-11 13:07:49 +05:30 |
|
Valmik Jangla
|
063946a02f
|
Removed from Purchase Invoice and Purchase Reciept
|
2016-03-11 13:07:48 +05:30 |
|
Valmik Jangla
|
d89dcf60e6
|
Removed from Delivery Note and Appraisal
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
|
2016-03-11 13:07:48 +05:30 |
|
Valmik Jangla
|
d4ac3d8ceb
|
Removed from Stock Ledger Entry and Sales Invoice
|
2016-03-11 13:07:48 +05:30 |
|
Valmik Jangla
|
98ec1164fc
|
Removed from Attendance, Upload Attendance, and Sales Order
|
2016-03-11 13:07:16 +05:30 |
|
Valmik Jangla
|
836fd6450d
|
Removed from Purchase Order and Supplier Quotation
|
2016-03-11 13:07:16 +05:30 |
|
Valmik Jangla
|
cd9daf6671
|
Removed from Journal Entry and Stock Reconciliation
|
2016-03-11 13:07:16 +05:30 |
|
Valmik Jangla
|
c7e774fda9
|
BudgetError Fix
|
2016-03-11 13:05:20 +05:30 |
|
Valmik Jangla
|
865d547965
|
Removed from GL Entry, Opportunity and Quotation
|
2016-03-11 13:05:20 +05:30 |
|
Valmik Jangla
|
bc60970fcb
|
Removed from Maitenance Visit and Warranty Claim
|
2016-03-11 13:05:19 +05:30 |
|
Valmik Jangla
|
319bbad4d4
|
Removed from Stock Entry
|
2016-03-11 13:05:19 +05:30 |
|
Valmik Jangla
|
57b69cecbf
|
Removed from C-Form
|
2016-03-11 13:05:19 +05:30 |
|
Valmik Jangla
|
634ecae020
|
Removed from Lead
|
2016-03-11 13:05:19 +05:30 |
|
Valmik Jangla
|
c4c603dcd2
|
Removed from Expense Claim
|
2016-03-11 13:05:19 +05:30 |
|
Valmik Jangla
|
1d797c1688
|
Removed from Installation Note
|
2016-03-11 13:05:19 +05:30 |
|
Anand Doshi
|
22ef68945d
|
[minor] comment about hack
|
2016-03-11 12:47:14 +05:30 |
|
Anand Doshi
|
39dda5cf49
|
bumped to version 6.25.5
|
2016-03-11 13:00:42 +06:00 |
|
shreyas
|
6c89bb1900
|
[Minor] Moved company field to top of the form, making it more consistent other doctypes
|
2016-03-11 12:12:30 +05:30 |
|
Anand Doshi
|
06b3ecb99b
|
bumped to version 6.25.4
|
2016-03-10 16:21:35 +06:00 |
|
Anand Doshi
|
6d59a41b27
|
[fix] delete Web Form contact
|
2016-03-10 14:31:04 +05:30 |
|
Anand Doshi
|
1bca0780a4
|
bumped to version 6.25.3
|
2016-03-10 13:18:52 +06:00 |
|
Anand Doshi
|
b015f9eca2
|
[fix] [hot] web form fixtures - removed Contact, added Issues and Addresses
|
2016-03-10 12:40:10 +05:30 |
|
ShashaQin
|
e8d635827a
|
Update item_prices.py
|
2016-03-10 14:55:06 +08:00 |
|
Anand Doshi
|
f0e16e68c5
|
Merge pull request #4962 from nabinhait/trial_balance_fix
[fix] Trial Balance report, showing rows with zero values
|
2016-03-10 12:24:24 +05:30 |
|
Nabin Hait
|
3883e86ad7
|
[fix] Trial Balance report, showing rows with zero values
|
2016-03-10 12:01:01 +05:30 |
|
Nabin Hait
|
dd8dbe000b
|
[fix] Rearranged position of mode_of_payment in sales invoice
|
2016-03-10 10:58:31 +05:30 |
|
ShashaQin
|
c6b5f7dcae
|
Update item_prices.py
|
2016-03-10 08:49:38 +08:00 |
|
Anand Doshi
|
25e947bef6
|
bumped to version 6.25.2
|
2016-03-09 19:34:54 +06:00 |
|
Anand Doshi
|
bb4db5ae80
|
[fix] [hot] german translation for Sales Return = Rücklieferung
|
2016-03-09 19:00:30 +05:30 |
|
Anand Doshi
|
a2d03c849f
|
bumped to version 6.25.1
|
2016-03-09 17:04:03 +06:00 |
|
Anand Doshi
|
0179242f04
|
[fix] [hot] setup wizard domain
|
2016-03-09 16:32:13 +05:30 |
|
Anand Doshi
|
1d0c5896c0
|
bumped to version 6.25.0
|
2016-03-09 16:17:14 +06:00 |
|
Saurabh
|
3fbf3ce852
|
[fixes] raise if selects product bundle as sub item in another product bundle.
|
2016-03-09 15:42:01 +05:30 |
|
Saurabh
|
bd01a81638
|
[fixes] calculate valuation rate for stock, non-stop and product bundle items
|
2016-03-09 15:42:01 +05:30 |
|
Saurabh
|
5ada14b887
|
[fixes] calculate valuation rate for non stock item
|
2016-03-09 15:42:01 +05:30 |
|
Saurabh
|
2d7af63351
|
[fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate
|
2016-03-09 15:42:00 +05:30 |
|
Saurabh
|
d313553ae3
|
[enhancement] get valuation rate and gross profit on sales order item
|
2016-03-09 15:42:00 +05:30 |
|
Anand Doshi
|
27e9b77a3d
|
[translations]
|
2016-03-09 14:50:38 +05:30 |
|
Anand Doshi
|
71ea34a0ba
|
[change log]
|
2016-03-09 14:50:37 +05:30 |
|
Anand Doshi
|
065d24b26d
|
Merge pull request #4951 from shreyasp/gross-profit-wn-sup17486
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
|
2016-03-09 14:22:16 +05:30 |
|
shreyas
|
7c42995949
|
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
|
2016-03-09 13:15:38 +05:30 |
|
Anand Doshi
|
3fb67c7c3b
|
Merge pull request #4945 from shreyasp/mr-wn-sup17487
[Minor] Displaying 'for warehouse' while creating Material request from BOM
|
2016-03-09 10:32:15 +05:30 |
|
ci2014
|
1e735a87aa
|
Update purchase-return.md
Fixed the images.
|
2016-03-08 17:13:18 +01:00 |
|
Neil Trini Lasrado
|
1b03e0a6d0
|
Added Other as a Domain in Company/setup wizard
|
2016-03-08 20:22:24 +05:30 |
|
Neil Trini Lasrado
|
342895c9df
|
Added Domain to setup wizard
|
2016-03-08 19:55:57 +05:30 |
|
ci2014
|
6dd7e682af
|
Update sales-return.md
Fixed the images.
|
2016-03-08 15:13:04 +01:00 |
|
shreyas
|
007e87b8a5
|
[Minor] Whitespace fixes
|
2016-03-08 19:01:50 +05:30 |
|
shreyas
|
405b66898e
|
[Minor] Displaying 'for warehouse' while creating Material request from BOM
|
2016-03-08 18:39:20 +05:30 |
|
Rushabh Mehta
|
d1e1c52171
|
[redesign] modules
|
2016-03-08 18:07:20 +05:30 |
|
Anand Doshi
|
b073cf4fa1
|
[fix] POS amount_paid when not cash - Fixes #4686, #4828, #4289
|
2016-03-08 17:59:19 +05:30 |
|
Anand Doshi
|
20b2a75603
|
Merge pull request #4943 from strixaluco/develop
Minor typo fix in bulk-rename.md
|
2016-03-08 17:40:48 +05:30 |
|
Javier Wong
|
102f9062e8
|
Whitelist get_month_details
This is useful when manually pulling the salary structure in custom scripts for processing of other customized deductables or perhaps contributions.
|
2016-03-08 17:39:58 +05:30 |
|
strixaluco
|
184f0fa264
|
Minor typo fix in bulk-rename.md
|
2016-03-08 16:57:04 +08:00 |
|
Anand Doshi
|
ba7b05ad27
|
Merge branch 'emakis-in_words_configurable' into develop
|
2016-03-07 20:00:54 +05:30 |
|
emakis
|
b5b3d478a2
|
Made In Words configurable
|
2016-03-07 20:00:41 +05:30 |
|
Anand Doshi
|
44f777eeec
|
[fix] Material Request notifications docstatus < 2
|
2016-03-07 19:35:54 +05:30 |
|
Anand Doshi
|
a2bd145d68
|
Merge pull request #4935 from shreyasp/sales-inv-WN-SUP17465
[Minor] Fix print settings for custom print format
|
2016-03-07 19:21:51 +05:30 |
|
Anand Doshi
|
40b230ea9e
|
Merge pull request #4926 from nabinhait/balance_sheet
[fix][report] Show group rows with zero values if there are values against children
|
2016-03-07 19:15:46 +05:30 |
|
shreyas
|
6f8dfa4c8d
|
[Minor] Fix print settings for custom print format
|
2016-03-07 18:22:40 +05:30 |
|
Anand Doshi
|
dab167791c
|
Merge pull request #4934 from anandpdoshi/fix/stock-balance-filters
[fix] Run Stock Balance report only after one of the filters is set
|
2016-03-07 14:31:08 +05:30 |
|
Anand Doshi
|
0902fb2e3d
|
[fix] Run Stock Balance report only after one of the filters is set
|
2016-03-07 13:11:59 +05:30 |
|
Rushabh Mehta
|
5a700820e7
|
[fix] [minor] autoload chart of accounts
|
2016-03-07 11:57:54 +05:30 |
|
ci2014
|
fde7bfec31
|
Update purchase-return.md
You swapped sales return and purchase return in the german documentation, see https://github.com/frappe/erpnext/pull/4931
|
2016-03-07 00:45:15 +01:00 |
|
ci2014
|
943d707021
|
Update sales-return.md
You swapped sales return and purchase return in the german documentation.
|
2016-03-07 00:42:55 +01:00 |
|
frehu01
|
eb5ad3f793
|
Update journal-entry.md
|
2016-03-06 17:52:29 +01:00 |
|
Nabin Hait
|
acb28954ff
|
[fix][report] Show group rows with zero values if there are values against children
|
2016-03-04 12:32:44 +05:30 |
|
Rushabh Mehta
|
d3c04a3eda
|
bumped to version 6.24.5
|
2016-03-03 17:18:45 +06:00 |
|