Kanchan Chauhan
|
2dbf5294a9
|
[WIP] No not merge
|
2016-04-20 16:24:24 +05:30 |
|
Nabin Hait
|
867dfec64b
|
Reload bin in reserved qty reposting patch
|
2016-04-20 11:53:34 +05:30 |
|
Neil Trini Lasrado
|
ab822c5d16
|
Removed no-copy from source in lead
|
2016-04-20 11:03:15 +05:30 |
|
Maxwell Morais
|
52ec0fa7e9
|
get_address_display calling method error
get_address_display, dont can be use in replacement as a function in the doctype controler, since it dont expect `cdt` and `cdn` as arguments.
972c25f78d/erpnext/public/js/utils/party.js (L53)
|
2016-04-18 13:24:25 -03:00 |
|
Rushabh Mehta
|
0525387328
|
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
|
2016-04-18 19:27:46 +05:30 |
|
Nabin Hait
|
c46c1f0288
|
[fix] Rejected serial nos in purchase invoice
|
2016-04-18 17:46:36 +05:30 |
|
Nabin Hait
|
14aa9c5320
|
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
|
2016-04-18 16:59:47 +05:30 |
|
Nabin Hait
|
ffd1e4efe6
|
Removed db_set from inside validate
|
2016-04-18 15:58:44 +05:30 |
|
Saurabh
|
7fee1b8343
|
[fixes] set expence account to item on sales invoice
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
224737b9ed
|
[fixes] split make gl entry function into chuncks as per SI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
fbb342c1ac
|
[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
130c57b201
|
[fixes] code clean-up
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
e29248bcb3
|
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
d697f3d6a3
|
[minor][fix] reset is_paid if company not selected
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
43520f93a1
|
[fixes] test cases, code cleanup.
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
2a0e2fe95c
|
[test-case] test update stock and payment
|
2016-04-18 15:57:56 +05:30 |
|
Saurabh
|
4bd34a58ba
|
[fixes] fix perpetual inventory
|
2016-04-18 15:57:55 +05:30 |
|
Saurabh
|
bd5fc8ecbe
|
[fixes] add posting time
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
c204775fe2
|
Added posting_time in purchase invoice
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
821f571640
|
added payments, make receipt field
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
524ebbcbb9
|
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
|
2016-04-18 15:57:55 +05:30 |
|
Rushabh Mehta
|
17d52becdf
|
[typo]
|
2016-04-15 16:51:33 +05:30 |
|
Rushabh Mehta
|
86a824c767
|
[ux] added opening stock and rate in new Item
|
2016-04-15 16:44:44 +05:30 |
|
Rushabh Mehta
|
e8e9440b06
|
[fix] [tests]
|
2016-04-15 15:19:35 +05:30 |
|
Rushabh Mehta
|
be2dde468d
|
[enhance] set material request title as comma separated list of items
|
2016-04-15 15:11:06 +05:30 |
|
Rushabh Mehta
|
a305c29b0e
|
[cleanup] remove is_pro_applicable
|
2016-04-15 15:03:16 +05:30 |
|
Nabin Hait
|
18f0dd0a6d
|
[translations]
|
2016-04-15 14:50:45 +05:30 |
|
Rushabh Mehta
|
dd9a973a0b
|
Merge pull request #5216 from umairsy/is-sales-purchase
Removed Is Sales Item and Is Purchase Item
|
2016-04-15 14:12:14 +05:30 |
|
Rushabh Mehta
|
f4c25b13e2
|
[fix] update total_projected_qty in bin.py
|
2016-04-15 13:01:09 +05:30 |
|
Umair Sayyed
|
72534deea2
|
removed Is Sales Item and Is Purchase Item
|
2016-04-15 12:57:00 +05:30 |
|
Rushabh Mehta
|
c65726bf07
|
[patch] hide new icons if equivalent old ones are set
|
2016-04-15 12:51:28 +05:30 |
|
Rushabh Mehta
|
18fc39b609
|
[feature] progress bars on production order
|
2016-04-15 11:24:19 +05:30 |
|
Nabin Hait
|
bd07ea43e8
|
fixed conflict
|
2016-04-15 11:06:41 +05:30 |
|
Nabin Hait
|
66953941ea
|
bumped to version 6.27.9
|
2016-04-15 11:31:32 +06:00 |
|
Nabin Hait
|
36c9d11bee
|
Merge pull request #5211 from nabinhait/jv_precision_fix
[fix] Set debit / credit as per field precision
|
2016-04-15 10:58:49 +05:30 |
|
Nabin Hait
|
972c25f78d
|
Fixed conflict
|
2016-04-14 18:25:53 +05:30 |
|
Nabin Hait
|
e393c62086
|
[fix] Set debit / credit as per field precision
|
2016-04-14 18:15:42 +05:30 |
|
Rushabh Mehta
|
15a7f215b9
|
[enhancement] heatmaps on item and notifications for item
|
2016-04-14 17:30:53 +05:30 |
|
Umair Sayyed
|
6269f1e3d0
|
address and contact related fields re-arranged in the sales transactions fixes #5192
|
2016-04-14 13:07:41 +05:30 |
|
ShashaQin
|
14baa70de3
|
Update project.py
|
2016-04-14 10:53:08 +08:00 |
|
Anand Doshi
|
65f2d92437
|
Merge branch 'vjFaLk-remove-celery' into develop
|
2016-04-13 19:28:56 +05:30 |
|
Valmik Jangla
|
4af736b989
|
Moved tasks content to newsletter.py
|
2016-04-13 19:11:55 +05:30 |
|
Rushabh Mehta
|
8c9c57c8f3
|
[minor] update party timestamp after transaction
|
2016-04-13 18:22:06 +05:30 |
|
Rushabh Mehta
|
0e2dd859b0
|
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
|
2016-04-13 17:22:09 +05:30 |
|
Nabin Hait
|
ba7d8b0cac
|
bumped to version 6.27.8
|
2016-04-13 16:34:37 +06:00 |
|
Nabin Hait
|
1ce6df8ff6
|
Merge pull request #5203 from nabinhait/credit_limit_fix
[fix] Ignore closed sales order in credit limit validation
|
2016-04-13 15:36:33 +05:30 |
|
Nabin Hait
|
7132bd3659
|
[fix] Ignore closed sales order in credit limit validation
|
2016-04-13 15:19:37 +05:30 |
|
Nabin Hait
|
13a2574bd6
|
Merge pull request #5159 from neilLasrado/setup-wizard-fix
Fixed setup wizard
|
2016-04-13 12:06:55 +05:30 |
|
Nabin Hait
|
09855fc3cc
|
Merge pull request #5158 from neilLasrado/hotfix
Removed education as a domain in ERPNext setup wizard
|
2016-04-13 12:05:11 +05:30 |
|
Nabin Hait
|
c2ae1a7375
|
fixed merge conflict
|
2016-04-13 11:55:15 +05:30 |
|
Nabin Hait
|
4b09f48d94
|
Merge pull request #5195 from nabinhait/stock_non_stock_item_toggle
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
|
2016-04-13 11:40:45 +05:30 |
|
Nabin Hait
|
c792e65d99
|
Merge pull request #5196 from nabinhait/report_fix34
[fix] Fixed pending so items for material request report
|
2016-04-13 11:40:34 +05:30 |
|
Rushabh Mehta
|
8bbca6fa2e
|
[enhancement] links menu in customer, supplier, item
|
2016-04-12 19:16:33 +05:30 |
|
Nabin Hait
|
dd94d4e43d
|
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
|
2016-04-12 19:00:50 +05:30 |
|
Nabin Hait
|
471908ab9f
|
Merge pull request #5194 from nabinhait/gross_profit_fix
Gross profit fix
|
2016-04-12 18:57:45 +05:30 |
|
Nabin Hait
|
9fef3df6a0
|
[fix] Fixed pending so items for material request report
|
2016-04-12 18:46:47 +05:30 |
|
Nabin Hait
|
8a686ba982
|
[fix] Prevent from directly creating payment request
|
2016-04-12 17:02:15 +05:30 |
|
Nabin Hait
|
f509d13d28
|
[fix] Get average selling rate based on group by
|
2016-04-12 17:01:39 +05:30 |
|
Valmik Jangla
|
6842f2e75c
|
WIP code migration from Celery to RQ
|
2016-04-11 17:41:34 +05:30 |
|
Rushabh Mehta
|
5d0e8dee11
|
[fix] dashboard for customer, supplier
|
2016-04-11 17:34:49 +05:30 |
|
Rohit Waghchaure
|
b2e7a1f605
|
[Fix] Default letter head
|
2016-04-11 17:30:44 +05:30 |
|
Nabin Hait
|
3912a31a6f
|
Merge pull request #5176 from nabinhait/ar_ap_print_currency
Currency column in AR/AP and Sales/Purchase register report
|
2016-04-11 17:13:04 +05:30 |
|
Nabin Hait
|
b713406e22
|
Merge pull request #5180 from nabinhait/stock_entry_actual_qty
[fix] Set actual qty onload of the draft stock entry. Fixed #5172
|
2016-04-11 17:12:34 +05:30 |
|
Nabin Hait
|
32b2a7795e
|
[fix] Set actual qty onload of the draft stock entry. Fixed #5172
|
2016-04-11 15:14:05 +05:30 |
|
Rohit Waghchaure
|
ae270d6648
|
[Fixes] Supplier can view their addresses, default buying price list issue
|
2016-04-11 13:58:33 +05:30 |
|
Nabin Hait
|
f945e10cce
|
Currency column in AR/AP and sales/purchase register report
|
2016-04-11 11:56:57 +05:30 |
|
Rushabh Mehta
|
f4d1b18895
|
[hooks] notify party on_change
|
2016-04-11 11:34:59 +05:30 |
|
Nabin Hait
|
e1433aab30
|
[fix] Fixed party update status patch
|
2016-04-09 16:12:40 +05:30 |
|
Kanchan Chauhan
|
a4ff5d3195
|
Collaborate PM permission fixes and daily tme log fix
|
2016-04-08 23:22:04 +05:30 |
|
Rushabh Mehta
|
2dff9275f3
|
[test] fixed circular dependencies
|
2016-04-08 18:05:12 +05:30 |
|
Rushabh Mehta
|
6fe962e6ad
|
[test] fixed circular dependencies
|
2016-04-08 17:55:11 +05:30 |
|
Anand Doshi
|
2f957f27b0
|
[fix] apply Tax Rule for lead
|
2016-04-08 17:43:08 +05:30 |
|
Rushabh Mehta
|
bdefa2414f
|
[test] [fix] test-dependency
|
2016-04-08 17:40:06 +05:30 |
|
Neil Trini Lasrado
|
7b46e5148a
|
Fixed setup wizard
|
2016-04-08 17:28:44 +05:30 |
|
Rushabh Mehta
|
8cd1ab894c
|
[minor] [fix] notifications for customer, supplier
|
2016-04-08 17:26:53 +05:30 |
|
Rushabh Mehta
|
dda1349a2d
|
[minor] [fix] typo in customer_list.js
|
2016-04-08 17:22:52 +05:30 |
|
Rushabh Mehta
|
f16f9c569b
|
[enhancement] add status in customer, supplier
|
2016-04-08 17:21:00 +05:30 |
|
Rushabh Mehta
|
203cc962f5
|
[enhancement] Item Selector
|
2016-04-08 17:21:00 +05:30 |
|
Anand Doshi
|
79a415e3b8
|
[fix] Use for shopping cart validation in Tax Rule
|
2016-04-08 17:08:26 +05:30 |
|
Neil Trini Lasrado
|
ce893499d7
|
Removed education as a domain in ERPNext setup wizard
|
2016-04-08 16:52:53 +05:30 |
|
Anand Doshi
|
9b8937d257
|
Merge pull request #5157 from agusputra/patch-29
Update quotation.md
|
2016-04-08 16:37:13 +05:30 |
|
Neil Trini Lasrado
|
cb6430575b
|
Fixed validation message for disabled employee
|
2016-04-08 16:36:26 +05:30 |
|
shreyas
|
ffeacb299d
|
[Fix] Show a message while user tries to create Material request with BOM which contains only non-stock item
|
2016-04-08 16:32:19 +05:30 |
|
Agus Syahputra
|
155edfc43e
|
Update quotation.md
|
2016-04-08 17:55:04 +07:00 |
|
Anand Doshi
|
3af1b00e4e
|
[fix] BOM name in test_records.json
|
2016-04-08 16:21:03 +05:30 |
|
Anand Doshi
|
e6e7cd90c9
|
Merge pull request #5143 from KanchanChauhan/somefixes
[Minor Fixes] Findings in setting up erpnext
|
2016-04-08 16:20:11 +05:30 |
|
Agus Syahputra
|
34f6145e9d
|
Update opening-stock.md
|
2016-04-08 16:35:59 +07:00 |
|
Anand Doshi
|
54910000d4
|
bumped to version 6.27.7
|
2016-04-07 18:11:48 +06:00 |
|
Anand Doshi
|
1f2f82fcc2
|
Merge pull request #5147 from vjFaLk/leave-allocation-fix
[Fix] Leave Allocation now includes To Date in Difference
|
2016-04-07 16:53:29 +05:30 |
|
Anand Doshi
|
1a0d32cdfb
|
[fix] [minor] Learn link in welcome to ERPNext
|
2016-04-07 16:28:01 +05:30 |
|
shreyas
|
b94b94afd9
|
[Fix] Move company field to top of the Stock Entry form
|
2016-04-07 16:25:29 +05:30 |
|
Valmik Jangla
|
c33e96f860
|
Leave Allocation Fix
|
2016-04-07 12:02:31 +05:30 |
|
Kanchan Chauhan
|
017d30f465
|
[Minor Fixes] Findings in setting up erpnext
|
2016-04-06 19:28:50 +05:30 |
|
Rushabh Mehta
|
78b7a53635
|
[cleanup] set default bold, print_hide for prints
|
2016-04-06 15:29:45 +05:30 |
|
Anand Doshi
|
ca95384f05
|
[fix] Salary Slip: use accounts.utils.get_fiscal_year
|
2016-04-06 12:31:01 +05:30 |
|
Anand Doshi
|
4b207647db
|
[fix] sanitize html of product bundle description
|
2016-04-05 18:34:11 +05:30 |
|
Anand Doshi
|
bcbfeb0d53
|
bumped to version 6.27.6
|
2016-04-04 18:24:48 +06:00 |
|
Anand Doshi
|
a32b3ea3e8
|
Merge pull request #5115 from nabinhait/test_fix
[fix] Test cases
|
2016-04-04 17:43:02 +05:30 |
|
Nabin Hait
|
94360cca20
|
[fix] received and delivered items to be billed report based on percentage billed
|
2016-04-04 17:40:33 +05:30 |
|
Anand Doshi
|
cd3ae0bb50
|
Merge pull request #5121 from kaflesudip/develop
Add User Remark to Quick Entry Form in Journal Entry
|
2016-04-04 17:07:21 +05:30 |
|
Anand Doshi
|
f1b276122e
|
Merge pull request #5117 from nabinhait/report_modified_change
[fix] Modified date changed in query report due to project field renaming
|
2016-04-04 17:04:14 +05:30 |
|
Rushabh Mehta
|
d690094b12
|
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
|
2016-04-04 16:57:56 +05:30 |
|
Anand Doshi
|
62be8dfd21
|
Merge pull request #5131 from shreyasp/creditnote-print-format
[Fix] Correct amount shown in credit note print format
|
2016-04-04 15:37:31 +05:30 |
|
shreyas
|
c6b47bcdda
|
[Fix] Show amount in credit note print format
|
2016-04-04 15:13:03 +05:30 |
|
Anand Doshi
|
15f7b1ee1a
|
[fix] POS paid amount validation using grand total
|
2016-04-04 15:03:28 +05:30 |
|
Kanchan Chauhan
|
7379fd4b9a
|
POS Search Fixed
|
2016-04-04 14:39:29 +05:30 |
|
Anand Doshi
|
08b39b1ff8
|
[fix] escape fg_item in production planning's get_so_items
|
2016-04-04 13:16:56 +05:30 |
|
sudip
|
0e55417f81
|
Add User Remarks to Quick Entry Form in Journal Entry
|
2016-04-02 08:42:42 +05:45 |
|
Nabin Hait
|
4f10f15686
|
[fix] Modified date changed in query report due to project field renaming
|
2016-04-01 17:59:06 +05:30 |
|
Nabin Hait
|
adddf6f471
|
[fix] Test cases
|
2016-04-01 16:47:46 +05:30 |
|
Rohit Waghchaure
|
e4b5fcb6e8
|
[Fix] Minor fix
|
2016-04-01 14:09:29 +05:30 |
|
Rushabh Mehta
|
0c76f21f81
|
[minor] absolute links for portal menu
|
2016-04-01 11:54:01 +05:30 |
|
Rushabh Mehta
|
d02038f591
|
Merge pull request #5110 from nabinhait/warranty_claim_fix
[fix] Get query for item in warranty claim
|
2016-04-01 11:44:48 +05:30 |
|
Rushabh Mehta
|
87736b7fc3
|
Merge pull request #5109 from agusputra/patch-27
Update managing-batch-wise-inventory.md
|
2016-04-01 11:44:27 +05:30 |
|
Rushabh Mehta
|
948ebfef16
|
Merge pull request #5108 from neilLasrado/expense-querry
Fixed bug in get expense query
|
2016-04-01 11:44:11 +05:30 |
|
Rushabh Mehta
|
8aa24232cf
|
Merge pull request #5103 from bohlian/develop
Set Resolution Date to include Time
|
2016-04-01 11:41:57 +05:30 |
|
Rushabh Mehta
|
7d480879ae
|
Merge pull request #5102 from agusputra/patch-26
Update managing-assets.md
|
2016-04-01 11:41:39 +05:30 |
|
Rushabh Mehta
|
8ca426d94a
|
Merge pull request #5095 from rohitwaghchaure/new_rfq
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
|
2016-04-01 11:41:15 +05:30 |
|
Rushabh Mehta
|
fff8e6c733
|
Merge pull request #5080 from nabinhait/fy_overlap
[fix] Added overlap validation in fiscal year
|
2016-04-01 11:37:03 +05:30 |
|
Nabin Hait
|
83e61bf368
|
[fix] Get query for item in warranty claim
|
2016-04-01 11:10:27 +05:30 |
|
Agus Syahputra
|
623f9f6bef
|
Update managing-batch-wise-inventory.md
|
2016-04-01 12:21:26 +07:00 |
|
Neil Trini Lasrado
|
30b97b0b45
|
Fixed bug in get expense query
|
2016-03-31 23:10:13 +05:30 |
|
rohitwaghchaure
|
62fea0374b
|
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
|
2016-03-31 21:49:07 +05:30 |
|
Rushabh Mehta
|
b04409746e
|
[fix] tests
|
2016-03-31 16:55:21 +05:30 |
|
Javier Wong
|
6487b525d0
|
Set Resolution Date to include Time
|
2016-03-31 18:27:36 +08:00 |
|
Agus Syahputra
|
c30dc6d2e6
|
Update managing-assets.md
|
2016-03-31 17:12:41 +07:00 |
|
Rushabh Mehta
|
45c6b550f0
|
[cleanup] assets and made items mandatory in transactions
|
2016-03-31 15:37:51 +05:30 |
|
Rushabh Mehta
|
acf28af19c
|
[fix] set default depreciation accounts and test fix
|
2016-03-31 15:04:06 +05:30 |
|
Rushabh Mehta
|
cb144bfcd4
|
[cleanup] projects
|
2016-03-31 14:27:35 +05:30 |
|
Nabin Hait
|
2ed0b59747
|
[fix] Added overlap validation in fiscal year
|
2016-03-31 12:40:37 +05:30 |
|
Nabin Hait
|
33f42aaad1
|
[fix] Get email field if field type is Code, Text, Small Text or Data
|
2016-03-31 11:59:10 +05:30 |
|
Nabin Hait
|
91a58808c0
|
[fix] Allowed deletion of root account
|
2016-03-31 11:59:10 +05:30 |
|
Nabin Hait
|
6123560f51
|
Merge pull request #5076 from vjFaLk/develop
Fix for Opportunity
|
2016-03-31 11:55:07 +05:30 |
|
Nabin Hait
|
1d04a23a00
|
Merge pull request #5082 from umairsy/perm-issue-2
[Fix] changed permission for the Stock Ledger Entry
|
2016-03-31 11:54:28 +05:30 |
|
Nabin Hait
|
b664cabeef
|
Merge pull request #5096 from nabinhait/test_case_fix
Test case fix
|
2016-03-31 11:53:07 +05:30 |
|
Rushabh Mehta
|
2d985e1973
|
[fix] edit-profile in frappe;
|
2016-03-30 17:15:33 +05:30 |
|
Rushabh Mehta
|
72b4ad8155
|
[cleanup] for quick-entry
|
2016-03-30 15:42:22 +05:30 |
|
Nabin Hait
|
9501a1e034
|
Links for fixed assets added in accounts module page
|
2016-03-30 15:06:26 +05:30 |
|
Nabin Hait
|
684052e978
|
[fix] Permissions added in asset and asset category
|
2016-03-30 15:06:25 +05:30 |
|
Nabin Hait
|
7fcec4118b
|
[fix] Test case
|
2016-03-30 15:06:25 +05:30 |
|
Anand Doshi
|
62ae39441d
|
Merge pull request #5091 from rmehta/portal-settings
[enhancement] configurable portal menu, fixes #5087
|
2016-03-30 14:38:11 +05:30 |
|
Rushabh Mehta
|
3fc6fdeba0
|
[cleanup] for quick-entry
|
2016-03-30 13:18:30 +05:30 |
|
Nabin Hait
|
c6285069dc
|
[fix] Item query in bom
|
2016-03-30 13:10:25 +05:30 |
|
Rushabh Mehta
|
c78b3110b5
|
[enhancement] configurable portal menu;
|
2016-03-30 12:29:48 +05:30 |
|
Rushabh Mehta
|
df7e523c3f
|
[fix] web forms for collaborative pm
|
2016-03-30 11:00:42 +05:30 |
|
Rushabh Mehta
|
8b43fd7f02
|
Merge pull request #5084 from KanchanChauhan/PM-UI-Edits
UI Changes
|
2016-03-29 18:45:58 +05:30 |
|
Kanchan Chauhan
|
b566d42d37
|
UI Changes
|
2016-03-29 18:21:59 +05:30 |
|
Nabin Hait
|
e8e2d406b5
|
minor fix
|
2016-03-29 18:17:03 +05:30 |
|
Rushabh Mehta
|
bb8c6de043
|
[opt] transaction.js
|
2016-03-29 17:52:22 +05:30 |
|
Rushabh Mehta
|
652dee45a6
|
[minor] make margin collapsible
|
2016-03-29 16:42:13 +05:30 |
|