Nabin Hait
|
06db236aa0
|
[fix] Allow Production Order, by default unchecked in item
|
2015-12-07 14:19:13 +05:30 |
|
Nabin Hait
|
733680bc3f
|
[translations]
|
2015-12-07 14:12:41 +05:30 |
|
Rushabh Mehta
|
14a0441b4b
|
[fix] removed temp_highlight
|
2015-12-07 12:28:03 +05:30 |
|
Rushabh Mehta
|
a311e706b0
|
[docs] home.png
|
2015-12-07 12:13:17 +05:30 |
|
Rushabh Mehta
|
e6a16c29df
|
[docs] index fix
|
2015-12-07 12:07:01 +05:30 |
|
Nabin Hait
|
92bb480fc3
|
Merge pull request #4432 from bohlian/develop
Purchase Invoice - Show Payment Button when Outstanding Amount !=0
|
2015-12-07 11:12:11 +05:30 |
|
Nabin Hait
|
7dc0da18b5
|
Merge pull request #4433 from nabinhait/expense_allow_import
[fix] Allowed import for Expense Claim
|
2015-12-07 11:11:35 +05:30 |
|
Nabin Hait
|
c8a2b94200
|
Merge pull request #4434 from nabinhait/whitelist_fix
[fix] get_incoming_rate function whitelisted
|
2015-12-07 11:11:21 +05:30 |
|
Nabin Hait
|
5eefff13a1
|
[fix] get_incoming_rate function whitelisted
|
2015-12-07 10:44:56 +05:30 |
|
Nabin Hait
|
9421e9873a
|
[fix] Allowed import for Expense Claim
|
2015-12-07 10:40:13 +05:30 |
|
bohlian
|
5e4c8a52ee
|
Payment To Be Shown When Outstanding Amount != 0
Payment button should be shown when outstanding amount != 0.
|
2015-12-07 12:06:08 +08:00 |
|
Saurabh
|
4f39fd243e
|
[fixes] recreate print format, shipping address on po for drop ship, validate update stock
|
2015-12-06 10:09:06 +05:30 |
|
Nabin Hait
|
c43a11a313
|
Merge pull request #4431 from nabinhait/leave_fix
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
|
2015-12-05 12:43:38 +05:30 |
|
Nabin Hait
|
1bffb42809
|
Merge pull request #4428 from nabinhait/get_exchange_rate
[fix] Get exchange rate as 1 if same currency
|
2015-12-05 12:43:13 +05:30 |
|
Nabin Hait
|
4660f820da
|
Merge pull request #4427 from nabinhait/offer_letter_fix
[fix] Offer letter print format fixed
|
2015-12-05 12:42:39 +05:30 |
|
Nabin Hait
|
1a19c05ef0
|
Merge pull request #4425 from nabinhait/bank_reco_fix
[fix] Fixed amounts not reflected in bank
|
2015-12-05 12:42:20 +05:30 |
|
Nabin Hait
|
d53e780fb8
|
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
|
2015-12-05 12:15:49 +05:30 |
|
Nabin Hait
|
0f5d97a156
|
[fix] Get exchange rate as 1 if same currency
|
2015-12-04 16:47:34 +05:30 |
|
Rushabh Mehta
|
2f273674e9
|
[docs] fixed links
|
2015-12-04 16:00:38 +05:30 |
|
Nabin Hait
|
734a40ad62
|
[fix] Offer letter print format fixed
|
2015-12-04 12:19:21 +05:30 |
|
Nabin Hait
|
9547b774f7
|
[fix] Fixed amounts not reflected in bank
|
2015-12-04 11:05:25 +05:30 |
|
Rushabh Mehta
|
e1f8b1d695
|
[minor] [production planning tool] include non production items without default BOM in multi-level BOM
|
2015-12-04 10:53:15 +05:30 |
|
Rushabh Mehta
|
7be2e985b0
|
[docs] updated generated docs
|
2015-12-03 18:28:19 +05:30 |
|
Rushabh Mehta
|
3b6287d849
|
[docs] updated generated docs
|
2015-12-03 18:27:13 +05:30 |
|
Rushabh Mehta
|
ab7021ce64
|
[docs] merged kb and cleanup. warning: don't see the commit
|
2015-12-03 17:59:34 +05:30 |
|
Rushabh Mehta
|
275b3eec0d
|
bumped to version 6.12.3
|
2015-12-03 18:28:57 +06:00 |
|
Rushabh Mehta
|
acaef538c2
|
Merge pull request #4420 from rmehta/stock-entry-fix
[minor] allow stock entry for manufacture without production order
|
2015-12-03 17:58:07 +05:30 |
|
Rushabh Mehta
|
041b062014
|
Merge pull request #4419 from nabinhait/salary_payment_days
[fix] Payment Days and holidays considering joining and relieving dates
|
2015-12-03 17:57:24 +05:30 |
|
Rushabh Mehta
|
39e603a154
|
Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate
Bank transfer exchange rate and account balance in COA
|
2015-12-03 17:56:03 +05:30 |
|
Nabin Hait
|
a4eeb919e6
|
[fix] Set payment days considering joinging date, reliving date and applicable holidays
|
2015-12-03 15:10:30 +05:30 |
|
Nabin Hait
|
c4d9554a05
|
[fix] Payment Days and holidays considering joining and relieving dates
|
2015-12-03 15:10:30 +05:30 |
|
Nabin Hait
|
4c7a32e446
|
[fix] Toggle required for sales and purchase tax template based on tax type
|
2015-12-03 11:47:38 +05:30 |
|
Rushabh Mehta
|
2c069a418a
|
[minor] allow stock entry for manufacture without production order
|
2015-12-03 11:10:23 +05:30 |
|
Rushabh Mehta
|
ba2596a7e0
|
[minor] validate email id before inviting user
|
2015-12-03 10:35:11 +05:30 |
|
Rushabh Mehta
|
f7911687a0
|
[minor] fixes to patch
|
2015-12-03 08:09:42 +05:30 |
|
Rushabh Mehta
|
5dd1aa9f31
|
bumped to version 6.12.2
|
2015-12-02 15:24:45 +06:00 |
|
Nabin Hait
|
8df5900f98
|
[fix] Inactive salary structure validation
|
2015-12-02 14:50:08 +05:30 |
|
Nabin Hait
|
f58a3726a7
|
Balance in chart of accounts in both company and account currency
|
2015-12-02 12:28:06 +05:30 |
|
Nabin Hait
|
1c77506e80
|
[fix] Don't overwrite exchange rate on saving for bank transfer
|
2015-12-02 12:28:06 +05:30 |
|
Rushabh Mehta
|
f1f556c0ac
|
Merge pull request #4409 from nabinhait/reorder_level
[fix] Reorder Qty mandatory if reorder level entered
|
2015-12-02 12:25:09 +05:30 |
|
Rushabh Mehta
|
4a1b9ac793
|
Merge pull request #4407 from nabinhait/develop
[fix] Mapping allowed for negative quantity
|
2015-12-02 12:24:49 +05:30 |
|
Nabin Hait
|
20abc2d0e8
|
[fix] Reorder Qty mandatory if reorder level entered
|
2015-12-01 19:01:19 +05:30 |
|
Rushabh Mehta
|
4496cc1e80
|
bumped to version 6.12.1
|
2015-12-01 18:48:28 +06:00 |
|
Rushabh Mehta
|
29cca2352c
|
[hot] [fix] trial balance report
|
2015-12-01 18:17:33 +05:30 |
|
Nabin Hait
|
d793fc9446
|
[fix] Mapping allowed for negative quantity
|
2015-12-01 17:28:12 +05:30 |
|
Nabin Hait
|
5b73dea9f6
|
[fix] Get items in stock reconciliation based on default warehouse or existing bin
|
2015-12-01 16:47:17 +05:30 |
|
Nabin Hait
|
c4edcf1532
|
[fix] Recurring test case fixed for the 1st day of the month
|
2015-12-01 16:28:35 +05:30 |
|
Rushabh Mehta
|
48b1633ff5
|
bumped to version 6.12.0
|
2015-12-01 16:54:13 +06:00 |
|
Rushabh Mehta
|
4140fa59c5
|
[translations]
|
2015-12-01 16:02:15 +05:30 |
|
Rushabh Mehta
|
afacc3d779
|
[minor] catch illegal reference, via error report
|
2015-12-01 15:53:07 +05:30 |
|
Rushabh Mehta
|
29f9f6c147
|
[fixes] [ux] get product bundle items only on po, mr and button on toolbar
|
2015-12-01 11:36:22 +05:30 |
|
Rushabh Mehta
|
37d9d6fdea
|
Merge pull request #4402 from nabinhait/allow_root_accounts
[feature] Allowed custom root accounts in Chart of Accounts
|
2015-12-01 10:59:44 +05:30 |
|
Rushabh Mehta
|
0cc177f73c
|
Merge pull request #4400 from nabinhait/total_amount_in_jv
[fix] Total Amount in Journal Entry in bank currency
|
2015-12-01 10:58:34 +05:30 |
|
Nabin Hait
|
8c4e043747
|
[feature] Allowed custom root accounts in Chart of Accounts
|
2015-12-01 10:34:43 +05:30 |
|
Nabin Hait
|
ddc295b4b3
|
[minor] Set expense account as Stock RBNB for perpetual inventory after mapping
|
2015-11-30 18:40:28 +05:30 |
|
Nabin Hait
|
621f4cd7c9
|
[fix] Invoicing against drop-ship Purchase Order
|
2015-11-30 18:40:28 +05:30 |
|
Rushabh Mehta
|
4750b1fdb7
|
Merge pull request #4397 from rmehta/setup-wizard-fixes
[minor] system settings in setup wizard moved to frappe
|
2015-11-30 17:17:16 +05:30 |
|
Nabin Hait
|
72e348daf5
|
[fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items
|
2015-11-30 16:26:49 +05:30 |
|
Nabin Hait
|
6c173e9730
|
[fix] Total Amount in Journal Entry in bank currency
|
2015-11-30 16:13:42 +05:30 |
|
Nabin Hait
|
ec1695dbe3
|
[fix] Bank Reconciliation in account currency
|
2015-11-30 15:23:46 +05:30 |
|
Rushabh Mehta
|
7909102edd
|
[minor] system settings in setup wizard moved to frappe
|
2015-11-30 15:12:45 +05:30 |
|
Rushabh Mehta
|
9f7de868ef
|
[fixes] stock reco, must always set qty and rate
|
2015-11-30 14:16:36 +05:30 |
|
Rushabh Mehta
|
d6c5235d58
|
[minor] [translation] fix #4343
|
2015-11-30 11:33:01 +05:30 |
|
Rushabh Mehta
|
32e55e174d
|
[minor] fix error message
|
2015-11-30 10:51:29 +05:30 |
|
Anand Doshi
|
47e82d1a49
|
bumped to version 6.11.3
|
2015-11-27 18:08:46 +06:00 |
|
Anand Doshi
|
563c243ec6
|
Revert "[hotfix] total amount in journal entry"
This reverts commit 5b03a75970.
|
2015-11-27 17:38:17 +05:30 |
|
Anand Doshi
|
711e675987
|
bumped to version 6.11.2
|
2015-11-27 17:54:49 +06:00 |
|
Anand Doshi
|
5b03a75970
|
[hotfix] total amount in journal entry
|
2015-11-27 17:24:06 +05:30 |
|
Anand Doshi
|
b8591da62c
|
bumped to version 6.11.1
|
2015-11-27 15:38:57 +06:00 |
|
Anand Doshi
|
a5f0a7ce06
|
[change-log]
|
2015-11-27 15:08:36 +05:30 |
|
Rushabh Mehta
|
9785cd35dc
|
[minor] quote optional in email digest
|
2015-11-27 14:50:15 +05:30 |
|
Anand Doshi
|
e38a53443a
|
Merge pull request #4386 from rmehta/bank-reco-bulk-edit
[enhancement] bulk edit in bank reconciliation, #4356
|
2015-11-27 14:46:58 +05:30 |
|
Anand Doshi
|
70f57eb7f0
|
[fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table
|
2015-11-27 14:38:01 +05:30 |
|
Rushabh Mehta
|
2d70887aaf
|
[enhancement] bulk edit in bank reconciliation, #4356
|
2015-11-27 11:37:18 +05:30 |
|
Anand Doshi
|
15b22c9d7d
|
Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template
[fix] Show Item Name in re-order email. Fixes #4381
|
2015-11-27 11:31:36 +05:30 |
|
Anand Doshi
|
4b12740e8d
|
[fix] Shipment in portal. Fixes #4291
|
2015-11-26 18:22:03 +05:30 |
|
Anand Doshi
|
f942d97a18
|
[fix] removed UOM Replace Utility from message
|
2015-11-26 16:08:09 +05:30 |
|
Anand Doshi
|
5cf7a0bf72
|
[fix] Show Item Name in re-order email. Fixes #4381
|
2015-11-26 15:11:18 +05:30 |
|
Anand Doshi
|
7c016d2ee2
|
bumped to version 6.11.0
|
2015-11-26 13:12:06 +06:00 |
|
Anand Doshi
|
666fbaff8c
|
[translations]
|
2015-11-26 12:40:13 +05:30 |
|
Anand Doshi
|
6674d1dc2b
|
[change-log]
|
2015-11-26 12:37:52 +05:30 |
|
Anand Doshi
|
5225a9752b
|
Merge pull request #4377 from rmehta/jv-print-fix
[fix] total amount in journal entry
|
2015-11-26 11:05:35 +05:30 |
|
Rushabh Mehta
|
0fd67b23f4
|
[minor] duplicate button on BOM cancel
|
2015-11-26 10:37:24 +05:30 |
|
Rushabh Mehta
|
b82bdd6f1f
|
[fix] total amount in journal entry
|
2015-11-26 09:08:07 +05:30 |
|
Rushabh Mehta
|
131bec67bc
|
Merge pull request #4373 from anandpdoshi/fix/status-updater-after-not-null
[fix] status update - update qty after int float not null change
|
2015-11-25 18:09:13 +05:30 |
|
Anand Doshi
|
ebae726237
|
[fix] status update - update qty after int float not null change
|
2015-11-25 17:55:47 +05:30 |
|
Anand Doshi
|
3314f1cba7
|
Merge pull request #4374 from rmehta/reorder-fix
[minor] re-order at re-order level, not below
|
2015-11-25 17:54:36 +05:30 |
|
Anand Doshi
|
a4870118ea
|
Merge pull request #4365 from anandpdoshi/fix/print-hide-if-0
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
|
2015-11-25 17:28:54 +05:30 |
|
Rushabh Mehta
|
03b3d66b90
|
[minor] re-order at re-order level, not below
|
2015-11-25 17:23:00 +05:30 |
|
Anand Doshi
|
5c968abcef
|
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
|
2015-11-25 16:33:00 +05:30 |
|
Anand Doshi
|
699d9be4b7
|
Merge pull request #4369 from bohlian/develop
Removed Warehouse Requirement for SerialNo Listing
|
2015-11-25 15:19:47 +05:30 |
|
Anand Doshi
|
ad5cf9b22e
|
Merge pull request #4370 from rmehta/manual-contribs
[manual] contributions via Robert Becht
|
2015-11-25 15:18:56 +05:30 |
|
Rushabh Mehta
|
bf07cba6a8
|
[manual] contributions via Robert Becht
|
2015-11-25 14:42:02 +05:30 |
|
bohlian
|
ff1ab26088
|
Removed Warehouse Requirement for SerialNo Listing
Removed the requirement that Warehouse has to be assigned for Serial Number to appear in the listing.
|
2015-11-25 16:06:20 +08:00 |
|
Anand Doshi
|
5c3469a01e
|
[fix] validate fiscal year dates and company name
|
2015-11-24 17:06:54 +05:30 |
|
Anand Doshi
|
625592e997
|
Merge pull request #4363 from anandpdoshi/fix/web-form-customization
[fix] Changed Country fieldtype to Link in Web Form
|
2015-11-24 13:26:23 +05:30 |
|
Anand Doshi
|
7221805587
|
[fix] Changed Country fieldtype to Link in Web Form
|
2015-11-23 19:20:51 +05:30 |
|
Nabin Hait
|
cf3cf2ca1f
|
[fix] Update exploded materials table from 'Update Cost' button
|
2015-11-23 15:12:18 +05:30 |
|
Nabin Hait
|
c4f4c09e42
|
Get Items from Product Bundle button in purchase cycle
|
2015-11-23 12:51:37 +05:30 |
|
Anand Doshi
|
fe1e5884b8
|
Merge pull request #4354 from nabinhait/pcv
[fix] Period closing account should be of type Liability / Equity
|
2015-11-23 12:35:06 +05:30 |
|
Nabin Hait
|
072c540ae3
|
[fix] Period closing account should be of type Liability / Equity
|
2015-11-23 09:52:08 +05:30 |
|
Anand Doshi
|
c6d91b8fb2
|
bumped to version 6.10.2
|
2015-11-20 18:40:04 +06:00 |
|
Anand Doshi
|
019111b05c
|
[translations]
|
2015-11-20 18:00:11 +05:30 |
|
Anand Doshi
|
ddad05dab3
|
[fix] Customer de-duplication sql
|
2015-11-20 17:29:40 +05:30 |
|
Revant Nandgaonkar
|
bde324a90f
|
fix frappe call to update_purchase_receipt_status
changed update_purchase_order_status to update_purchase_receipt_status
|
2015-11-20 12:41:58 +05:30 |
|
Anand Doshi
|
56c605f36e
|
bumped to version 6.10.1
|
2015-11-20 01:12:15 +06:00 |
|
Anand Doshi
|
8c56adf42b
|
[hotfix] drop ship patch
|
2015-11-20 00:41:28 +05:30 |
|
Nabin Hait
|
19ce11aa9c
|
bumped to version 6.10.0
|
2015-11-19 15:04:29 +06:00 |
|
Nabin Hait
|
f649013079
|
Merge pull request #4329 from anandpdoshi/int-float-not-null
[enhancement] Int, Currency, Float, Percent as not null and default to 0
|
2015-11-19 14:30:58 +05:30 |
|
Anand Doshi
|
120ea62acc
|
[fix] get_balance_on: convert date to string
|
2015-11-19 14:24:39 +05:30 |
|
Anand Doshi
|
602e8253be
|
[enhancement] Int, Currency, Float, Percent as not null and default to 0
|
2015-11-19 13:23:36 +05:30 |
|
Nabin Hait
|
06df19b56a
|
Reload PO Item before patch
|
2015-11-19 12:46:37 +05:30 |
|
Nabin Hait
|
0f72750fc8
|
Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction
[fix] pull earning and deduction on change of employee
|
2015-11-19 12:06:37 +05:30 |
|
Nabin Hait
|
5284b22c53
|
[fix] Mapping from negative outstanding invoice
|
2015-11-19 11:42:23 +05:30 |
|
Nabin Hait
|
343c1a5cbd
|
[fix] Mapping from Payment Tool
|
2015-11-19 11:42:22 +05:30 |
|
Anand Doshi
|
7763bb5c15
|
[fix] pull earning and deduction on change of employee
|
2015-11-18 19:04:03 +05:30 |
|
Saurabh
|
b65c69f9eb
|
[fixes] drop ship test case fixes
|
2015-11-18 17:39:26 +05:30 |
|
Saurabh
|
2e292060c5
|
[fix] Reserved and ordered qty fix for drop ship orders
|
2015-11-18 17:39:26 +05:30 |
|
Saurabh
|
a4bf02de6c
|
[fixes] overlapping allocation
|
2015-11-18 17:39:26 +05:30 |
|
Saurabh
|
3bcf82c7a6
|
[fixes] test leave allocation record creation
|
2015-11-18 17:39:26 +05:30 |
|
Saurabh
|
55222a5b82
|
[fixes] test case fixes
|
2015-11-18 17:39:26 +05:30 |
|
Saurabh
|
2c85efe31a
|
[fixes] hide drop ship section and typo
|
2015-11-18 17:39:26 +05:30 |
|
Saurabh
|
20628f5bd8
|
[patch] mo drop shipment from purchase order to purchase order item
|
2015-11-18 17:39:25 +05:30 |
|
Saurabh
|
caf122f015
|
[fixes] dropship fixes
|
2015-11-18 17:39:25 +05:30 |
|
Nabin Hait
|
b73f3da02c
|
Merge pull request #4332 from nabinhait/pi_fix
[fix] Check Purchase Receipt mandatory only for stock items
|
2015-11-18 17:30:29 +05:30 |
|
Nabin Hait
|
f0607b45c5
|
Merge pull request #4334 from revant/patch-1
Mode of Payment validate
|
2015-11-18 17:29:54 +05:30 |
|
Nabin Hait
|
b45ca3ada0
|
Merge pull request #4331 from nabinhait/pcv_fix
[fix] Allowed Equity accounts in closing account in Period Closing Voucher
|
2015-11-18 17:15:57 +05:30 |
|
Nabin Hait
|
11e8728715
|
Merge pull request #4336 from nabinhait/offer_letter_print_format
[fix] Don't add pagebreak in print format if terms contains only spaces and newlines
|
2015-11-18 17:15:34 +05:30 |
|
Rushabh Mehta
|
edc8ab03b5
|
[minor] fixed description
|
2015-11-18 16:48:19 +05:30 |
|
Revant Nandgaonkar
|
27c266b081
|
improve mode_of_payment validate_accounts
using frappe.db.get_value instead of frappe.get_list
|
2015-11-18 13:28:09 +05:30 |
|
Nabin Hait
|
c7fc11a812
|
[fix] Don't add pagebreak in print format if terms contains only spaces and newlines
|
2015-11-18 12:59:00 +05:30 |
|
Rushabh Mehta
|
d962d1c96f
|
[minor] remove feedback line from digest
|
2015-11-18 10:53:03 +05:30 |
|
Revant Nandgaonkar
|
11f8a0033a
|
Mode of Payment validate
Error when Same Company is entered multiple times in accounts
Error when Company of Ledger account doesn't match with Company Selected
|
2015-11-17 21:15:00 +05:30 |
|
Anand Doshi
|
da79740cdf
|
[fix] injection
|
2015-11-17 18:27:50 +05:30 |
|
Nabin Hait
|
2cf1699937
|
[fix] Check Purchase Receipt mandatory only for stock items
|
2015-11-17 17:32:07 +05:30 |
|
Nabin Hait
|
1a3413875f
|
[fix] Allowed Equity accounts in closing account in Period Closing Voucher
|
2015-11-17 17:12:44 +05:30 |
|
Anand Doshi
|
3667da1053
|
[fix] Set user_id as Reply-To in birthday reminder emails
|
2015-11-16 19:31:20 +05:30 |
|
Nabin Hait
|
d9e57978b8
|
bumped to version 6.9.2
|
2015-11-16 18:42:03 +06:00 |
|
Nabin Hait
|
e8f4790d0a
|
[hotfix]
|
2015-11-16 18:10:15 +05:30 |
|
Nabin Hait
|
6826ca19b1
|
bumped to version 6.9.1
|
2015-11-16 17:37:38 +06:00 |
|
Nabin Hait
|
de46fd62d8
|
Delete v6_9_1.md
|
2015-11-16 17:06:51 +05:30 |
|
Nabin Hait
|
6f7cd47ac6
|
[change-log] Added change log
|
2015-11-16 17:04:48 +05:30 |
|
Nabin Hait
|
94e90bddaa
|
[change-log] Added change log
|
2015-11-16 17:01:12 +05:30 |
|
Nabin Hait
|
43ce642649
|
[fix] Uncheck 'Is Production Item' if it is a non-stock item
|
2015-11-16 16:50:59 +05:30 |
|
Nabin Hait
|
8e2d76bd63
|
bumped to version 6.9.0
|
2015-11-16 17:12:56 +06:00 |
|
Anand Doshi
|
34af16140e
|
Merge pull request #4315 from rmehta/standard-in-web-form
Web form, make standard
|
2015-11-16 16:24:14 +05:30 |
|
Nabin Hait
|
b3a68c3f40
|
Merge pull request #4323 from nabinhait/leaves
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
|
2015-11-16 15:57:04 +05:30 |
|
Nabin Hait
|
9f2fd009b0
|
Merge pull request #4318 from nabinhait/sal_fix
[fix] Check Salary Structure validity
|
2015-11-16 15:52:52 +05:30 |
|
Nabin Hait
|
3858d12f1d
|
Merge pull request #4317 from nabinhait/close_feature
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
|
2015-11-16 15:52:41 +05:30 |
|
Nabin Hait
|
adc93b797a
|
Merge pull request #4316 from nabinhait/advance_fix
[fix] Invoice Outstanding calculation related to advance
|
2015-11-16 15:50:32 +05:30 |
|
Nabin Hait
|
b6de519571
|
[fix] Test case fixed
|
2015-11-16 15:50:10 +05:30 |
|
Nabin Hait
|
58c4646199
|
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
|
2015-11-16 15:35:14 +05:30 |
|
Anand Doshi
|
4fbf01fd9d
|
[fix] urlencode address list's link
|
2015-11-16 15:05:49 +05:30 |
|
Anand Doshi
|
1ed82834ce
|
[fix] re-make setup wizard slides on change of language
|
2015-11-16 12:58:14 +05:30 |
|
Nabin Hait
|
cd87e76d88
|
[fix] Check Salary Structure validity
|
2015-11-15 11:06:55 +05:30 |
|
Rushabh Mehta
|
834b3e6f83
|
[fix] added missing address hook for website permissions
|
2015-11-13 14:38:12 +05:30 |
|
Nabin Hait
|
95d025f9aa
|
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
|
2015-11-13 14:22:32 +05:30 |
|
Nabin Hait
|
90c6d7bb47
|
[fix] Invoice Outstanding calculation related to advance
|
2015-11-13 14:04:03 +05:30 |
|
Nabin Hait
|
59ba9e3d56
|
Merge pull request #4314 from anandpdoshi/fix/po-non-stock-receive
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
|
2015-11-13 13:59:04 +05:30 |
|
Rushabh Mehta
|
c1531e7008
|
[minor] catch SSL error on make_thumbnail, via support
|
2015-11-13 11:39:38 +05:30 |
|
Rushabh Mehta
|
511421b6a3
|
[minor] [enhancement] ability to make web-form standard, reload web-forms, merge after https://github.com/frappe/frappe/pull/1405
|
2015-11-13 11:04:50 +05:30 |
|
Rushabh Mehta
|
26c54bb4fb
|
[minor] new quote
|
2015-11-13 10:42:20 +05:30 |
|
Anand Doshi
|
d4b05fbd51
|
bumped to version 6.8.4
|
2015-11-12 21:07:12 +06:00 |
|
Anand Doshi
|
d65a03d437
|
[fix] material request type in reorder
|
2015-11-12 20:36:44 +05:30 |
|
Anand Doshi
|
f774f75c63
|
bumped to version 6.8.3
|
2015-11-12 21:05:48 +06:00 |
|
Anand Doshi
|
5f6546c8a5
|
bumped to version 6.8.2
|
2015-11-12 20:31:53 +06:00 |
|
Anand Doshi
|
ca5b593e38
|
[hotfix] setup wizard tax rate
|
2015-11-12 20:00:50 +05:30 |
|
Anand Doshi
|
cea5479f4d
|
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
|
2015-11-12 18:39:57 +05:30 |
|
Anand Doshi
|
6303f84d45
|
[minor] fix test case
|
2015-11-12 18:11:58 +05:30 |
|
Anand Doshi
|
87c0e9f03a
|
bumped to version 6.8.1
|
2015-11-12 18:12:41 +06:00 |
|
Anand Doshi
|
d40d1e9a59
|
[optimize] Payment Reconciliation and Payment Tool
|
2015-11-12 17:42:05 +05:30 |
|
Anand Doshi
|
3fc1c44334
|
bumped to version 6.8.0
|
2015-11-12 17:40:48 +06:00 |
|
Anand Doshi
|
bb347f5afa
|
[translations]
|
2015-11-12 16:39:58 +05:30 |
|
Anand Doshi
|
938b530ebf
|
[change-log]
|
2015-11-12 15:44:09 +05:30 |
|
Anand Doshi
|
0b5489ca88
|
Merge pull request #4312 from nabinhait/delete_uom_replace_utility
Deleted Stock UOM Replace Utility
|
2015-11-12 15:26:41 +05:30 |
|
Anand Doshi
|
adebf31041
|
Merge pull request #4313 from saurabh6790/doc
[help-page] drop-shipping documentation
|
2015-11-12 15:25:50 +05:30 |
|
Saurabh
|
11cc43a5a6
|
[help-page] drop-shipping documentation
|
2015-11-12 12:39:21 +05:30 |
|
Nabin Hait
|
61fb7ee5b8
|
Deleted Stock UOM Replace Utility
|
2015-11-12 12:06:47 +05:30 |
|
Rushabh Mehta
|
37b4d75e4a
|
[re-org] setup wizard in frappe
|
2015-11-12 11:45:47 +05:30 |
|
Anand Doshi
|
f71ecbba2c
|
Merge pull request #4311 from rmehta/auth-rule-cleanup
Auth rule cleanup
|
2015-11-12 11:40:55 +05:30 |
|
Anand Doshi
|
c5c6c0669f
|
[fix] gross profit
|
2015-11-12 11:07:32 +05:30 |
|
Anand Doshi
|
fe85b2ea17
|
Merge branch 'nabinhait-erpnext_docs' into develop
|
2015-11-10 18:59:55 +05:30 |
|
Anand Doshi
|
1c1eb7018c
|
[docs] fixed Linked With and title
|
2015-11-10 18:58:56 +05:30 |
|
Anand Doshi
|
39982a5f02
|
bumped to version 6.7.8
|
2015-11-10 12:01:29 +06:00 |
|
Rushabh Mehta
|
8f228dd7f9
|
[fix] [minor] closed not in notifications
|
2015-11-10 11:28:35 +05:30 |
|
Rushabh Mehta
|
739aa4d51a
|
[minor] allow pricing rule to have negative discount
|
2015-11-09 17:05:12 +05:30 |
|
Nabin Hait
|
f9ef0e4e15
|
[docs] Fixed ref docs, image and video links
|
2015-11-09 15:41:45 +05:30 |
|
Nabin Hait
|
fc51ec7f58
|
[docs] Added existing erpnext manual
|
2015-11-09 14:40:34 +05:30 |
|
Nabin Hait
|
7ba4d02444
|
[docs] First commit for docs
|
2015-11-09 14:40:29 +05:30 |
|
Anand Doshi
|
7489d29813
|
bumped to version 6.7.7
|
2015-11-09 13:47:49 +06:00 |
|
Anand Doshi
|
7f77002015
|
Revert b28573ab03
|
2015-11-09 13:16:24 +05:30 |
|
Anand Doshi
|
b28573ab03
|
Merge pull request #4294 from neilLasrado/develop
[Minor fix] Allowed maintenance schedule to be imported via data import tool
|
2015-11-09 13:13:41 +05:30 |
|
Anand Doshi
|
c756ff67b0
|
Merge pull request #4296 from anandpdoshi/sales-order-allow-delivery
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
|
2015-11-09 13:13:14 +05:30 |
|
Anand Doshi
|
4e72ef1421
|
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
|
2015-11-09 13:01:49 +05:30 |
|
Neil Trini Lasrado
|
6b173f3a67
|
Allowed maintenance schedule to be imported via data import tool
|
2015-11-09 11:38:06 +05:30 |
|
Rushabh Mehta
|
bbcce8cca0
|
[minor] [cleanup] cosmetic cleanup and fix to start auth rule, did not do big cleanup
|
2015-11-09 11:28:51 +05:30 |
|
Rushabh Mehta
|
c438c1dec7
|
[minor] allow pricing rule to have negative discount
|
2015-11-07 20:28:43 +05:30 |
|
Anand Doshi
|
64949bfc4b
|
bumped to version 6.7.6
|
2015-11-07 16:10:22 +06:00 |
|
Anand Doshi
|
438c4fb279
|
[patch] reload doctype Leave Allocation
|
2015-11-07 15:38:29 +05:30 |
|
Rushabh Mehta
|
0d7213122a
|
bumped to version 6.7.5
|
2015-11-06 17:24:17 +06:00 |
|
Rushabh Mehta
|
4268b0092a
|
[minor] don't show po / mr buttons if delivered
|
2015-11-06 16:52:18 +05:30 |
|
Rushabh Mehta
|
64e31e9a4e
|
[fix] process payroll
|
2015-11-06 14:47:12 +05:30 |
|
Rushabh Mehta
|
1a8d4b6ea7
|
bumped to version 6.7.4
|
2015-11-06 12:15:09 +06:00 |
|
Rushabh Mehta
|
97426776bd
|
Merge pull request #4281 from nabinhait/address_fix
[fix] Clear addressed and contacts on a new form
|
2015-11-06 11:02:31 +05:30 |
|
Rushabh Mehta
|
169089bdde
|
bumped to version 6.7.3
|
2015-11-06 11:19:53 +06:00 |
|
Rushabh Mehta
|
c14f80838b
|
[fix] [hot] leave allocation patch
|
2015-11-06 10:49:16 +05:30 |
|
Rushabh Mehta
|
0d58501229
|
bumped to version 6.7.2
|
2015-11-06 11:11:06 +06:00 |
|
Nabin Hait
|
7c654cd1bb
|
Leave allocation patch included
|
2015-11-06 10:37:26 +05:30 |
|
Rushabh Mehta
|
54fc260a42
|
[minor] trigger link triggers while mapping material request to po to set supplier default currency
|
2015-11-05 15:26:02 +05:30 |
|
Rushabh Mehta
|
7a39d51366
|
[fix] pull tax rate in item tax
|
2015-11-05 15:19:11 +05:30 |
|
Nabin Hait
|
c3ced9a0b5
|
[fix][report] Buying amount for product bundle in Gross Profit report
|
2015-11-05 13:13:31 +05:30 |
|
Rushabh Mehta
|
afd3209017
|
bumped to version 6.7.1
|
2015-11-05 11:21:31 +06:00 |
|
Rushabh Mehta
|
c541b87bb9
|
[thumbnail] remove attachment if fails
|
2015-11-05 10:49:42 +05:30 |
|
Rushabh Mehta
|
6a7edd32aa
|
bumped to version 6.7.0
|
2015-11-04 18:48:07 +06:00 |
|
Rushabh Mehta
|
fc307970aa
|
[translations]
|
2015-11-04 18:02:45 +05:30 |
|
Rushabh Mehta
|
b9e7cb02f4
|
[change-log]
|
2015-11-04 17:02:13 +05:30 |
|
Saurabh
|
d805bd7daf
|
[fixes] update delivery status
|
2015-11-04 16:40:09 +05:30 |
|
Rushabh Mehta
|
ac53f2dbb1
|
[test] [fix]
|
2015-11-04 15:47:08 +05:30 |
|
Rushabh Mehta
|
20a7d820ab
|
[fix] shot ledger buttons for closed DN / PR
|
2015-11-04 15:31:41 +05:30 |
|
Rushabh Mehta
|
d48c2394e8
|
[cleanup] drop ship testing & cleanup
|
2015-11-04 15:24:04 +05:30 |
|
Rushabh Mehta
|
58101e9e6c
|
Merge pull request #4272 from nabinhait/report-fix1
[report] Added delay in payment column
|
2015-11-04 13:18:42 +05:30 |
|
Rushabh Mehta
|
666131d2fe
|
Merge pull request #4271 from saurabh6790/drop-shipping
Exclude warehouse from drop ship and re-open status for DN / PR
|
2015-11-04 13:18:20 +05:30 |
|
Rushabh Mehta
|
118f043335
|
Merge pull request #4270 from rmehta/email-digest-fix
Email digest fixes
|
2015-11-04 13:18:08 +05:30 |
|
Nabin Hait
|
b4a51ec80b
|
[report] Added delay in payment column
|
2015-11-04 13:09:48 +05:30 |
|
Saurabh
|
6197860643
|
[fixes] test case update
|
2015-11-04 12:43:40 +05:30 |
|
Saurabh
|
95fbfa4928
|
[fixes] typo fixes
|
2015-11-04 12:10:01 +05:30 |
|
Saurabh
|
b7f0a4961e
|
- no delivery / reserve warehouse in drop ship
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
|
2015-11-04 12:03:54 +05:30 |
|
Rushabh Mehta
|
9c044eefff
|
[cleanup] re-arrange drop ship field
|
2015-11-03 18:28:37 +05:30 |
|
Rushabh Mehta
|
5951692db0
|
[fix] cleanup stop-resume code
|
2015-11-03 18:20:39 +05:30 |
|
Rushabh Mehta
|
bd4814fbb7
|
[fix] email digest periods for weekly and monthly
|
2015-11-03 16:55:33 +05:30 |
|
Rushabh Mehta
|
7d23e4286e
|
[minor] move item to top in stock module page
|
2015-11-03 16:25:09 +05:30 |
|
Saurabh
|
c40148e0da
|
[fixes] missing delivered by supplier field
|
2015-11-03 10:32:46 +05:30 |
|
Rushabh Mehta
|
a9dda232b2
|
[minor] move item to top in stock module page
|
2015-11-02 17:47:50 +05:30 |
|
Saurabh
|
12ffd914ee
|
[fixes] args fixes
|
2015-11-02 16:10:09 +05:30 |
|
Rushabh Mehta
|
b1d8979a59
|
Merge pull request #4179 from saurabh6790/drop-shipping
Drop shipping
|
2015-11-02 15:43:48 +05:30 |
|
Rushabh Mehta
|
ec2d0030b7
|
Merge pull request #4265 from nabinhait/jv_fix
[cleanup] Make Payment Entry from Order/Invoice
|
2015-11-02 15:23:01 +05:30 |
|
Rushabh Mehta
|
55d0506155
|
Merge pull request #4264 from superlack/patch-3
Update time_log_batch.py
|
2015-11-02 15:21:59 +05:30 |
|
Rushabh Mehta
|
5e9b52c273
|
Merge pull request #4263 from superlack/patch-2
Update time_log_batch_detail.json
|
2015-11-02 15:21:54 +05:30 |
|
Rushabh Mehta
|
00b4663e12
|
Merge pull request #4262 from saurabh6790/close_pr_dn
[feature] Close feature for Purchase Receipt and Delivery Note
|
2015-11-02 15:21:19 +05:30 |
|
Rushabh Mehta
|
e54a4004ec
|
Merge pull request #4258 from anandpdoshi/fixes-3to6
[fix] issues encountered migrating from v3/4 to 6
|
2015-11-02 15:20:25 +05:30 |
|
Rushabh Mehta
|
d0b086ca54
|
Merge pull request #4255 from anandpdoshi/slovene-language
added Slovene and updated translations
|
2015-11-02 15:20:17 +05:30 |
|
Rushabh Mehta
|
8d1191ac8f
|
Merge pull request #4252 from anandpdoshi/edge-case-website-variant-selection
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
|
2015-11-02 15:20:10 +05:30 |
|
Rushabh Mehta
|
a938b81e1c
|
Merge pull request #4251 from saurabh6790/hr
Leave allocation based on Date range
|
2015-11-02 15:19:55 +05:30 |
|
Saurabh
|
7cd0ba70d9
|
[fixes] typo error
|
2015-11-02 15:18:23 +05:30 |
|
Nabin Hait
|
66340f9894
|
[cleanup] Make Payment Entry from Order/Invoice
|
2015-11-02 14:40:47 +05:30 |
|
superlack
|
41f7f7442b
|
Update time_log_batch.py
|
2015-11-02 00:39:36 -08:00 |
|
superlack
|
126fb31f9a
|
Update time_log_batch_detail.json
|
2015-11-02 00:38:17 -08:00 |
|
Saurabh
|
a8a91cca16
|
[feature] Close feature for Purchase Receipt and Delivery Note
|
2015-11-02 12:57:08 +05:30 |
|
Saurabh
|
381385d19a
|
[fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO
|
2015-11-02 11:30:51 +05:30 |
|
Anand Doshi
|
aba8fdd18d
|
[fix] issues encountered migrating from v3/4 to 6
|
2015-10-31 22:49:42 +05:30 |
|
Nabin Hait
|
915778fb69
|
[fix] Clear addressed and contacts on a new form
|
2015-10-30 14:43:13 +05:30 |
|
Anand Doshi
|
bacc679df5
|
[language] added Slovene and updated translations
|
2015-10-30 12:54:27 +05:30 |
|
Anand Doshi
|
b0388d971a
|
[minor] reduced size of video placeholder
|
2015-10-30 12:54:10 +05:30 |
|
Saurabh
|
61c9ea938d
|
[Change Log] change log entry for drop shipment
|
2015-10-30 12:02:24 +05:30 |
|
Saurabh
|
6956eee790
|
[fixes] test case and code rewrite
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
2e65aadb1e
|
[fixes] reload doc after status update and supplier address fetching
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
653cffec1e
|
[change_log and fixes] set print hide, add change_log
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
cc8f1afa56
|
[fixes] test case fixes for drop shipping
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
2f702dcb32
|
[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
f857d81f35
|
[fixes]test case to check updated delivered qty
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
6d64fe378d
|
[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
b0ab93f779
|
[fixes] typo error
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
df1c1a573f
|
[fixes] test case for per_ordered
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
a1f2aec918
|
[fixes] check ordered and reserved qrt, check closed status for so and po
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
d8930a776d
|
[fixes] test case import fix
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
8a8ef85174
|
[fixes] reviwe fixes
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
edba048c14
|
[fixes] set is_stock_item for test items
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
b705798ccb
|
[enhance & fixes] Print Format on PO for Drop Shipping
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
5e0b0b4b97
|
[enhance] make PO from SO if supplier is specified
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
a4efbf0db7
|
[fixes] check for close status
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
e930f0f74e
|
[fixes] filter on supplier list for DropShip, checking closed status
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
99543f72d8
|
[fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
1a9646739a
|
[fixes][rename-field-name] drop_ship to is_drop_ship
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
bd65cb8817
|
[fixes] field rename and test case for drop ship
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
98b287565a
|
[enhance] close purchase order
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
c6dbe70256
|
[Fixes] Drop Shipping
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
556536615e
|
[minor fix] Status fix in listview
|
2015-10-29 19:43:31 +05:30 |
|
Saurabh
|
8bd96f1c08
|
[Test Case] Test case to check drop shipping
|
2015-10-29 19:43:31 +05:30 |
|
Saurabh
|
5b7e9a1c94
|
[minor fixes]
|
2015-10-29 19:43:31 +05:30 |
|
Saurabh
|
c306b21415
|
[merge fixes]
|
2015-10-29 19:43:31 +05:30 |
|
Anand Doshi
|
c39cef363c
|
[fix] stop welcome video if user moves to another page
|
2015-10-29 18:37:17 +05:30 |
|
Nabin Hait
|
02a56b4e1a
|
bumped to version 6.6.7
|
2015-10-29 17:05:06 +06:00 |
|
Nabin Hait
|
9a6df0341f
|
Merge pull request #4246 from anandpdoshi/welcome-to-erpnext
Show Welcome to ERPNext after completing Setup Wizard
|
2015-10-29 16:29:10 +05:30 |
|
Anand Doshi
|
7dab3c1f85
|
Show Welcome to ERPNext after completing Setup Wizard
|
2015-10-29 15:32:00 +05:30 |
|
Nabin Hait
|
f9a974385a
|
[fix] Consider Rejected Qty for Qty validation in Purchase Receipt
|
2015-10-29 14:54:29 +05:30 |
|
Saurabh
|
20a653e829
|
[fixes] Test case fixes for leave application
|
2015-10-29 14:27:57 +05:30 |
|
Saurabh
|
a2c668cb77
|
[fixes] patch, test cases and validations
|
2015-10-29 14:27:57 +05:30 |
|
Saurabh
|
d0b0a80be3
|
[enhacement] remove fiscal year from leave allocation
|
2015-10-29 14:27:57 +05:30 |
|
Anand Doshi
|
532b9e8bfb
|
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
|
2015-10-29 13:20:07 +05:30 |
|
Anand Doshi
|
21e09a2bd8
|
[enhancement] Ability to disable an Item
|
2015-10-29 12:39:47 +05:30 |
|
Nabin Hait
|
1aa6e98136
|
Merge pull request #4249 from nabinhait/cc_fix
[fix] Default cost center as per company
|
2015-10-29 12:28:20 +05:30 |
|
Nabin Hait
|
8372c44262
|
[fix] Default cost center as per company
|
2015-10-29 11:50:36 +05:30 |
|
Anand Doshi
|
6d69ca6bac
|
[fix] don't show expired items in website item list. Fixes #4210.
|
2015-10-29 11:35:16 +05:30 |
|
Nabin Hait
|
4757d0634a
|
bumped to version 6.6.6
|
2015-10-28 16:37:13 +06:00 |
|
Nabin Hait
|
dc8ce7f7e9
|
Merge pull request #4245 from nabinhait/sr_no
[fix] Serial No query in Warranty Claim
|
2015-10-28 15:51:32 +05:30 |
|
Nabin Hait
|
a90a0528aa
|
Fixed conflict
|
2015-10-28 15:50:26 +05:30 |
|
Nabin Hait
|
350f9592d3
|
Merge pull request #4237 from sbkolate/develop
[minor] Update Help Video Links in Buying, CRM, Selling #4233
|
2015-10-28 15:44:39 +05:30 |
|
Nabin Hait
|
43e50de6ef
|
Merge pull request #4243 from nabinhait/last_pur_rate
[patch] Deleted Item-wise Last Purchase Rate report
|
2015-10-28 15:42:35 +05:30 |
|
Nabin Hait
|
a530f410e3
|
Merge pull request #4242 from nabinhait/to_warehouse_dn
[fix] Ignore users permission for To Warehouse field in Delivery Note
|
2015-10-28 15:42:16 +05:30 |
|
Nabin Hait
|
bdfb070ed6
|
[fix] Serial No query in Warranty Claim
|
2015-10-28 15:38:22 +05:30 |
|