Nabin Hait
|
38e4c6f2af
|
Allow same serial nos for raw materials and fg item in repack / manufacture entry
|
2015-10-13 18:37:39 +05:30 |
|
Neil Trini Lasrado
|
58e9590850
|
Fixed issues with Permissions in Company Doctype
|
2015-10-13 17:45:43 +05:30 |
|
Nabin Hait
|
03afb45e34
|
[fix] Validate deletion of serial no
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
d91382dbf3
|
[fix] serial no status
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
e07958bbda
|
Change log and sopnsors for delivery to target warehouse
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
b445be3552
|
Test case for delivery to target warehouse
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
c865f229fb
|
Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status
|
2015-10-13 15:46:42 +05:30 |
|
Neil Trini Lasrado
|
ec5deb6e48
|
Changed label in Company
|
2015-10-13 15:28:12 +05:30 |
|
Neil Trini Lasrado
|
486bf2e113
|
Added Change Log
|
2015-10-13 15:17:53 +05:30 |
|
Neil Trini Lasrado
|
f49b085625
|
Allowed Income account to be added to Cost Center
|
2015-10-13 14:54:39 +05:30 |
|
Rushabh Mehta
|
4f4fc45ae6
|
bumped to version 6.4.7
|
2015-10-13 15:16:15 +06:00 |
|
Rushabh Mehta
|
86125b2b9f
|
[fix] sales order status for maintenance
|
2015-10-13 12:31:05 +05:30 |
|
Rushabh Mehta
|
22d0d586ab
|
[minor] [typo]
|
2015-10-13 12:30:21 +05:30 |
|
Rushabh Mehta
|
eb62aed8c7
|
Merge pull request #4157 from nabinhait/bin
[fix][patch] Delete duplicate bins
|
2015-10-12 18:39:16 +05:30 |
|
Rushabh Mehta
|
60f1739ca5
|
Merge pull request #4158 from rmehta/journal-entry-title-fix
[fix] set title in Journal Entry only if not set
|
2015-10-12 18:35:49 +05:30 |
|
Rushabh Mehta
|
5f349a67c9
|
Merge pull request #4156 from rmehta/item-section-fix
[fix] [minor] collapsible section for Item - removed custom script
|
2015-10-12 18:35:38 +05:30 |
|
Rushabh Mehta
|
fd294eb981
|
Merge pull request #4154 from rmehta/sales-analytics-fix
[minor] [fix] Use customer_name in Sales Analytics
|
2015-10-12 18:32:39 +05:30 |
|
Rushabh Mehta
|
d256055a8c
|
Merge pull request #4153 from rmehta/stock-entry-fix
[fix] [minor] stock_entry.py error for None qty
|
2015-10-12 18:32:28 +05:30 |
|
Rushabh Mehta
|
cefa106a06
|
Merge pull request #4151 from anandpdoshi/purchase-invoice-letterhead
[fix] Added Letter Head field to Purchase Invoice
|
2015-10-12 18:30:25 +05:30 |
|
Rushabh Mehta
|
67ecfcf52c
|
Merge pull request #4148 from saurabh6790/erp_support
[minor fix], escape % char
|
2015-10-12 18:30:13 +05:30 |
|
Nabin Hait
|
b7e46c4ed9
|
[fix][patch] Delete duplicate bins
|
2015-10-12 18:28:50 +05:30 |
|
Rushabh Mehta
|
bc5ecfff06
|
Merge pull request #4146 from nabinhait/fix10
[fix] Multiple minor fixes
|
2015-10-12 18:27:02 +05:30 |
|
Rushabh Mehta
|
8fa4845d00
|
[fix] set title in Journal Entry only if not set
|
2015-10-12 16:59:52 +05:30 |
|
Rushabh Mehta
|
d4882653c3
|
[fix] [minor] collapsible section for Item - removed custom script
|
2015-10-12 16:45:53 +05:30 |
|
Anand Doshi
|
9a4d165ba2
|
[fix] get_party_details.js - set posting_date if args are initialised
|
2015-10-12 16:23:51 +05:30 |
|
Rushabh Mehta
|
a7099eaa8d
|
[minor] [fix] Use customer_name in Sales Analytics
|
2015-10-12 16:22:10 +05:30 |
|
Anand Doshi
|
4b72d05793
|
[fix] get allocated_percentage from party's sales team
|
2015-10-12 16:15:52 +05:30 |
|
Rushabh Mehta
|
a30f3ea1f9
|
[fix] [minor] stock_entry.py error for None qty
|
2015-10-12 16:12:52 +05:30 |
|
Anand Doshi
|
4fa69780a8
|
[fix] Added Letter Head field to Purchase Invoice
|
2015-10-12 15:55:24 +05:30 |
|
Rushabh Mehta
|
2dc619ae1f
|
[fix] copy task titles with project
|
2015-10-12 15:55:12 +05:30 |
|
Nabin Hait
|
fc9031924e
|
[fix] Field type of Age field converted to Int
|
2015-10-12 15:47:07 +05:30 |
|
Saurabh
|
e14124198d
|
minor fix, escape % char
|
2015-10-12 15:08:09 +05:30 |
|
Nabin Hait
|
51e980dd2c
|
[fix] Multiple minor fixes
|
2015-10-10 18:10:05 +05:30 |
|
Rushabh Mehta
|
c03cba9d17
|
[fix] sales order notification
|
2015-10-08 11:46:32 +05:30 |
|
Nabin Hait
|
9801745090
|
bumped to version 6.4.6
|
2015-10-07 17:57:23 +06:00 |
|
Anand Doshi
|
7866c6e6db
|
[fix] modified in sales order and purchase order
|
2015-10-07 17:26:19 +05:30 |
|
Nabin Hait
|
4c502bcd26
|
bumped to version 6.4.5
|
2015-10-07 15:10:32 +06:00 |
|
Nabin Hait
|
714948c867
|
Merge pull request #4136 from nabinhait/uom
[fix] Fetch UOM Conversion Factor from template if not specified in variants
|
2015-10-07 14:30:18 +05:30 |
|
Nabin Hait
|
8f3b360f83
|
Merge pull request #4133 from saurabh6790/erp_support
Calendar view for holiday listing
|
2015-10-07 14:29:38 +05:30 |
|
Nabin Hait
|
314086d6c0
|
[fix] Fetch UOM Conversion Factor from template if not specified in variants
|
2015-10-07 11:55:08 +05:30 |
|
Nabin Hait
|
bcd655a985
|
Merge pull request #4109 from rmehta/fix-sales-purchase-order-status
[fix] sales & purchase order status
|
2015-10-07 11:34:30 +05:30 |
|
Saurabh
|
b0dbdc1439
|
minor fixes
|
2015-10-07 11:27:25 +05:30 |
|
Nabin Hait
|
37b0bf257d
|
Merge pull request #4117 from nabinhait/sample_data
[fix] Create sample opportunity and quotation only if Customer exists
|
2015-10-07 11:25:50 +05:30 |
|
Nabin Hait
|
c5a25f44e1
|
Merge pull request #4119 from nabinhait/fix3
[fix] Return account currency only if account provided
|
2015-10-07 11:25:19 +05:30 |
|
Nabin Hait
|
8dafa376ab
|
Merge pull request #4123 from nabinhait/fix4
[fix] allowed more than 2 currencies in Journal Entry
|
2015-10-07 11:24:45 +05:30 |
|
Saurabh
|
74eb8e34da
|
[Fixes] minor fix for fiscal year in holiday list
|
2015-10-07 11:17:14 +05:30 |
|
Nabin Hait
|
5c66fb7631
|
Merge pull request #4130 from nabinhait/reports
[fix][report] Left join used in pending reports
|
2015-10-07 11:15:36 +05:30 |
|
Nabin Hait
|
be3b3b2107
|
Merge pull request #4132 from nabinhait/credit_limit
minor fix in credit limit
|
2015-10-07 11:15:02 +05:30 |
|
Nabin Hait
|
8a7bdd5a92
|
[fix] Valuation Rate in Stock Balance report
|
2015-10-06 18:46:56 +05:30 |
|
Saurabh
|
1d753c92b1
|
Calendar view for holiday listing
|
2015-10-06 15:21:23 +05:30 |
|
Nabin Hait
|
54ecc8ebba
|
minor fix in credit limit
|
2015-10-06 14:28:41 +05:30 |
|
Nabin Hait
|
f4edaef481
|
[fix][report] Left join used in pending reports
|
2015-10-06 12:48:04 +05:30 |
|
Nabin Hait
|
ebbd163903
|
[fix] allowed more than 2 currencies in Journal Entry
|
2015-10-05 13:21:38 +05:30 |
|
Nabin Hait
|
8954b24b22
|
[fix] Return account currency only if account provided
|
2015-10-04 12:27:46 +05:30 |
|
Nabin Hait
|
ae92fc7f35
|
[fix] Create sample opportunity and quotation only if Customer exists
|
2015-10-03 13:42:44 +05:30 |
|
Rushabh Mehta
|
0bc3ca02f3
|
[fix] default contact for website
|
2015-10-03 12:08:43 +05:30 |
|
Rushabh Mehta
|
d10ba853e6
|
[fix] sales & purchase order status
|
2015-10-02 17:16:51 +05:30 |
|
Anand Doshi
|
789a798e36
|
bumped to version 6.4.4
|
2015-10-02 17:05:36 +06:00 |
|
Nabin Hait
|
fbef1fdf3a
|
Minor fix
|
2015-10-02 16:26:18 +05:30 |
|
Nabin Hait
|
7a287a9153
|
[patch] Fix affected Journal Entries due to reconciliation
|
2015-10-02 16:00:42 +05:30 |
|
Anand Doshi
|
71f23acc2b
|
bumped to version 6.4.3
|
2015-10-02 13:13:27 +06:00 |
|
Anand Doshi
|
1a1f790150
|
[fix] test case
|
2015-10-02 12:34:18 +05:30 |
|
Rushabh Mehta
|
3c54e9779b
|
Merge pull request #4108 from nabinhait/payment_reco
[fix] Payment Reconciliation in multi-currency
|
2015-10-02 12:32:54 +05:30 |
|
Nabin Hait
|
db48b7d764
|
[fix] Payment Reconciliation in multi-currency
|
2015-10-02 12:05:55 +05:30 |
|
Rushabh Mehta
|
83c0899c83
|
[fix] [minor] default ranges for demo
|
2015-10-02 11:31:37 +05:30 |
|
Anand Doshi
|
d9ab725be4
|
[fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked
|
2015-10-01 19:17:02 +05:30 |
|
Anand Doshi
|
7afaeb0820
|
[fix] the case when party account currency is missing
|
2015-10-01 18:55:43 +05:30 |
|
Anand Doshi
|
ba48f82e03
|
bumped to version 6.4.2
|
2015-10-01 14:31:22 +06:00 |
|
Anand Doshi
|
8e7e128e81
|
Merge pull request #4104 from nabinhait/addresses_and_contacts
[fix] get permission query condition if no permitted links
|
2015-10-01 14:00:38 +05:30 |
|
Anand Doshi
|
0353569e8b
|
Merge pull request #4103 from nabinhait/monthly_attendance_sheet
[fix] Month issue fixed in Monthly Attendance Sheet
|
2015-10-01 13:58:33 +05:30 |
|
Anand Doshi
|
665e2f5418
|
Merge pull request #4100 from nabinhait/general_ledger_report
[fix] General Ledger report fixed
|
2015-10-01 13:56:13 +05:30 |
|
Nabin Hait
|
dace2b6796
|
[fix] get permission query condition if no permitted links
|
2015-10-01 13:54:46 +05:30 |
|
Nabin Hait
|
712b02593a
|
[fix] Month issue fixed in Monthly Attendance Sheet
|
2015-10-01 12:35:54 +05:30 |
|
Nabin Hait
|
f924e08b93
|
[fix] Validate duplicate email ids in Lead
|
2015-10-01 11:51:48 +05:30 |
|
Nabin Hait
|
5c623dae4d
|
[fix] General Ledger report fixed
|
2015-10-01 11:22:15 +05:30 |
|
Anand Doshi
|
e2c3d40b57
|
[hotfix] Payment Reconciliation Invoice Type
|
2015-10-01 11:21:26 +05:30 |
|
Anand Doshi
|
673887455f
|
[fix] Show Contribution (%) in Sales Team table in Customer Form
|
2015-10-01 11:21:25 +05:30 |
|
Anand Doshi
|
bf7294cf5c
|
bumped to version 6.4.1
|
2015-09-30 21:20:59 +06:00 |
|
Nabin Hait
|
72d2d682ae
|
Repost GL Entries for Journal Entries where reference name is missing
|
2015-09-30 18:50:54 +05:30 |
|
Anand Doshi
|
21f6ea6f7e
|
[hotfix] remove allow on submit from item tables
|
2015-09-30 18:45:29 +05:30 |
|
Anand Doshi
|
f3006972d5
|
bumped to version 6.4.0
|
2015-09-30 17:53:52 +06:00 |
|
Anand Doshi
|
dccc6bc11d
|
[change-log]
|
2015-09-30 17:19:51 +05:30 |
|
Anand Doshi
|
15d2c89939
|
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
erpnext/accounts/report/general_ledger/general_ledger.py
|
2015-09-30 17:13:58 +05:30 |
|
Anand Doshi
|
ca4c8a2a46
|
[translations]
|
2015-09-30 17:10:58 +05:30 |
|
Anand Doshi
|
c320fe541d
|
Merge pull request #4067 from anandpdoshi/remove-party-account-currency
Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
|
2015-09-30 16:55:24 +05:30 |
|
Anand Doshi
|
f40a87511e
|
Merge pull request #4091 from rmehta/repack-allow-low-rate
[fix] remove validation to disallow lower rate
|
2015-09-30 16:46:31 +05:30 |
|
Anand Doshi
|
4945b94950
|
[fix] added validation to match account currency with existing gle and test case
|
2015-09-30 16:41:15 +05:30 |
|
Rushabh Mehta
|
cb96b61449
|
[fix] remove validation to disallow lower rate
|
2015-09-30 16:22:05 +05:30 |
|
Anand Doshi
|
248c867a2c
|
[minor] removed test case for party multi-currency validation, since party multi-currency is now based on account
|
2015-09-30 15:11:13 +05:30 |
|
Anand Doshi
|
da98ab6f3c
|
[fix] Only 1 account per company for a party
|
2015-09-30 15:11:12 +05:30 |
|
Anand Doshi
|
cd0989e051
|
Added method get_account_currency
|
2015-09-30 15:11:12 +05:30 |
|
Anand Doshi
|
b20baf894f
|
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
|
2015-09-30 15:11:12 +05:30 |
|
Nabin Hait
|
d3cf4f1264
|
Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate
return exchange rate as 1 if no account is specified
|
2015-09-30 15:05:41 +05:30 |
|
Anand Doshi
|
2dbe2b63b2
|
Merge pull request #4088 from anandpdoshi/address-contact-permissions
Apply permissions on address and contact based on permissions of Customer, Supplier
|
2015-09-30 12:19:50 +05:30 |
|
Anand Doshi
|
edba8f5582
|
[fix] Print 'Attach' field in Stock Entry Detail
|
2015-09-30 11:50:08 +05:30 |
|
Anand Doshi
|
89b8d11f9c
|
[fix] Apply permissions on address and contact based on permissions of Customer, Supplier
|
2015-09-29 20:11:57 +05:30 |
|
Anand Doshi
|
19a33994da
|
[cleanup] removed desk_home and desk_home_flows from conf.js
|
2015-09-29 20:06:22 +05:30 |
|
Rushabh Mehta
|
89349d3ae3
|
[fix] [payment-reconciliation] ignore rows with blank invoice numbers
|
2015-09-29 16:39:53 +05:30 |
|
Rushabh Mehta
|
4bcbcd29f7
|
[enhancement] lower priority for newsletter emails
|
2015-09-29 14:58:45 +05:30 |
|
Anand Doshi
|
740a11263f
|
[minor] validate invoice number is selected in Payment Reconciliation
|
2015-09-29 12:55:11 +05:30 |
|
Anand Doshi
|
142859f36e
|
Merge pull request #4076 from anandpdoshi/shopping-cart-order
check doc.has_website_permission in order.html. Merge after frappe/frappe#1316
|
2015-09-28 19:40:17 +05:30 |
|
Anand Doshi
|
6534ad082d
|
Merge pull request #4069 from anandpdoshi/round-status-updater-percentages
Round status update percentages to 2 decimals
|
2015-09-28 19:40:01 +05:30 |
|
Rushabh Mehta
|
7f75dbf061
|
[cleanup] remove backup manager
|
2015-09-28 19:12:54 +05:30 |
|
Anand Doshi
|
199d8a44fc
|
[fix] check doc.has_website_permission in order.html
|
2015-09-28 19:04:42 +05:30 |
|
Rushabh Mehta
|
72b1128467
|
[fixes] accounts controller add flt
|
2015-09-28 17:29:46 +05:30 |
|
Anand Doshi
|
d6cb55ad1a
|
[fix] return exchange rate as 1 if no account is specified
|
2015-09-28 17:20:02 +05:30 |
|
Anand Doshi
|
c76e34d7de
|
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
|
2015-09-28 17:01:44 +05:30 |
|
Anand Doshi
|
33b10faf94
|
Merge pull request #4074 from anandpdoshi/multi-level-bom-fetch
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
|
2015-09-28 17:00:52 +05:30 |
|
Anand Doshi
|
d970b001a4
|
[fix] Round status update percentages to 2 decimals
|
2015-09-28 16:52:22 +05:30 |
|
Anand Doshi
|
d767fb6134
|
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
|
2015-09-28 16:44:48 +05:30 |
|
gmarke
|
e5a31462fe
|
Update get_item_details.py
like this it will be possible to correctly handle cost center for stock entries when no default cost center per company is set
|
2015-09-27 09:38:01 +02:00 |
|
Anand Doshi
|
6f39300d43
|
Merge pull request #4068 from anandpdoshi/due-date-validation
if no party, don't validate due date based on credit days
|
2015-09-25 17:31:33 +05:30 |
|
Anand Doshi
|
0ca587e018
|
[fix] if no party, don't validate due date based on credit days
|
2015-09-25 16:32:14 +05:30 |
|
Rushabh Mehta
|
8ffe12ebe4
|
[chart-of-accounts] added default for Guatemala
|
2015-09-25 15:40:33 +05:30 |
|
Anand Doshi
|
8579af371c
|
Merge pull request #4057 from rmehta/gl-report-fix
GL Report Fix
|
2015-09-25 12:30:26 +05:30 |
|
Rushabh Mehta
|
b5ff9421e1
|
[optimize] customer outstanding query
|
2015-09-25 12:25:12 +05:30 |
|
Nabin Hait
|
44bd3b2601
|
[fix] Fetch gl entries in receivable/payable report only if party mentioned
|
2015-09-25 10:33:51 +05:30 |
|
Nabin Hait
|
1b6c00e2c7
|
[report] Trial Balance for Party
|
2015-09-25 09:18:03 +05:30 |
|
Anand Doshi
|
f723032fd7
|
bumped to version 6.3.2
|
2015-09-24 18:01:11 +06:00 |
|
Anand Doshi
|
3297c43bdf
|
[fix] Tax Rule permission to Account Manager
|
2015-09-24 17:29:28 +05:30 |
|
Anand Doshi
|
aea250bc5a
|
[fix] [patch] fix missing default lead
|
2015-09-24 16:31:36 +05:30 |
|
Anand Doshi
|
d37d4dfdec
|
[fix] applicable territory patch and tax rule tests
|
2015-09-24 15:44:39 +05:30 |
|
Anand Doshi
|
7f96c20f5b
|
bumped to version 6.3.1
|
2015-09-24 15:53:05 +06:00 |
|
Anand Doshi
|
e75d947867
|
[fix] [patch] convert applicable territory
|
2015-09-24 15:22:12 +05:30 |
|
Anand Doshi
|
bba0a5d38f
|
[fix] [patch] tax rule
|
2015-09-24 15:11:24 +05:30 |
|
Anand Doshi
|
953e97536a
|
[fix] [patch] tax rule
|
2015-09-24 15:05:06 +05:30 |
|
Anand Doshi
|
e74d7ca33e
|
[fix] [patch] tax rule
|
2015-09-24 15:04:15 +05:30 |
|
Rushabh Mehta
|
8f2b8afcb7
|
[fix] gl entry report if not filtered
|
2015-09-24 15:03:53 +05:30 |
|
Anand Doshi
|
b3f12c3109
|
[fix] [patch] convert_applicable_territory
|
2015-09-24 15:01:27 +05:30 |
|
Anand Doshi
|
f66e6aacd4
|
[fix] [patch] convert_applicable_territory
|
2015-09-24 14:59:26 +05:30 |
|
Anand Doshi
|
ab57e52cbd
|
bumped to version 6.3.0
|
2015-09-24 15:05:35 +06:00 |
|
Anand Doshi
|
e63da9813c
|
Merge remote-tracking branch 'frappe/master' into develop
Conflicts:
erpnext/patches.txt
|
2015-09-24 14:34:50 +05:30 |
|
Anand Doshi
|
c020e42d20
|
[fix] [patch] convert applicable territory
|
2015-09-24 13:08:35 +05:30 |
|
Anand Doshi
|
b126ba0132
|
[change-log]
|
2015-09-24 13:06:00 +05:30 |
|
Anand Doshi
|
c6e4b5978d
|
[fix] Sales Order - get_query fix
|
2015-09-24 11:32:54 +05:30 |
|
Anand Doshi
|
361eca4cae
|
Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit
Sales Team editable after submit
|
2015-09-24 11:30:31 +05:30 |
|
Anand Doshi
|
9fc03b6c10
|
Merge pull request #4052 from rmehta/fix-operation-name
[fix] minor, remove operation naming field from operation
|
2015-09-24 11:30:07 +05:30 |
|
Anand Doshi
|
e2d46d0474
|
[fix] Allow Sales Team to be added/updated after submit
|
2015-09-23 19:26:29 +05:30 |
|
Rushabh Mehta
|
dd2f2f5321
|
[fix] minor, remove operation naming field from operation
|
2015-09-23 17:06:01 +05:30 |
|
Anand Doshi
|
6e4f5a214a
|
Merge pull request #4033 from rmehta/portal-fixes
Portal Fixes
|
2015-09-23 16:05:12 +05:30 |
|
Anand Doshi
|
b07b0a9e54
|
[fix] Sales Order indicators for Maintenance
|
2015-09-23 15:52:11 +05:30 |
|
Rushabh Mehta
|
307978fea9
|
[test-fixes]
|
2015-09-23 15:43:09 +05:30 |
|
Anand Doshi
|
06ad308ca1
|
[fixes] setup wizard and other fixes related to cart
|
2015-09-23 12:50:35 +05:30 |
|
Anand Doshi
|
52dfc32eca
|
[fix] validate_valuation_rate for Repack
|
2015-09-23 12:50:35 +05:30 |
|
Rushabh Mehta
|
72fbf902d7
|
[cleanup] added single price list for shopping cart, removed Applicable Territory
|
2015-09-23 12:50:34 +05:30 |
|
Rushabh Mehta
|
8ffd483e24
|
[wip] shopping cart shipping rule, price list cleanup
|
2015-09-23 12:49:16 +05:30 |
|
Rushabh Mehta
|
3d76686b82
|
[shopping-cart] cart via Jinja WIP
|
2015-09-23 12:49:16 +05:30 |
|
Rushabh Mehta
|
156ce607e2
|
[cleanup] [wip] portal, shopping cart cleanup
|
2015-09-23 12:49:16 +05:30 |
|
Anand Doshi
|
65b6762247
|
Merge pull request #4049 from bobzz-zone/patch-11
Update item_grid.html
|
2015-09-23 12:09:26 +05:30 |
|
Rushabh Mehta
|
abdfb4d3db
|
[fixed] New button in POS Sales Invoice, reported via forum
|
2015-09-23 12:05:51 +05:30 |
|
bobzz-zone
|
3bcb13b1b8
|
Update item_grid.html
Change the colour of the indicator to be green when delivered qty is bigger than ordered qty
|
2015-09-23 11:42:06 +07:00 |
|
Anand Doshi
|
b6ec680c46
|
[fix] round percentages in get_indicator
|
2015-09-22 16:36:20 +05:30 |
|
Anand Doshi
|
53a0de7607
|
[fix] Recalculate rate after applying Pricing Rule
|
2015-09-22 15:26:53 +05:30 |
|
Anand Doshi
|
0a1d037f01
|
Merge pull request #3974 from rmehta/dms
[enhancement] document management system
|
2015-09-22 14:51:01 +05:30 |
|
Nabin Hait
|
5b649521d1
|
[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool
|
2015-09-22 13:06:34 +05:30 |
|
Anand Doshi
|
798e75832c
|
[fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability
|
2015-09-22 12:59:43 +05:30 |
|
Nabin Hait
|
c0c94aef44
|
[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool
|
2015-09-22 08:37:37 +05:30 |
|
Anand Doshi
|
e4dfeb651f
|
[optimization] get balance on
|
2015-09-21 19:31:43 +05:30 |
|
Anand Doshi
|
f7e6eb4fd7
|
[optimization] get balance on
|
2015-09-21 19:30:21 +05:30 |
|
Rushabh Mehta
|
97c858a5e3
|
[fix] pull sales team from customer
|
2015-09-21 10:03:38 +05:30 |
|
Rushabh Mehta
|
974892bf87
|
Merge pull request #4036 from rmehta/no-party-currency
[fix] no default party currency
|
2015-09-18 13:40:42 +05:30 |
|
Rushabh Mehta
|
361df8993f
|
[fix] no default party currency
|
2015-09-18 12:59:51 +05:30 |
|
Anand Doshi
|
b8b8de7a49
|
[hotfix] multicurrency gl entry
|
2015-09-17 21:07:45 +05:30 |
|
Anand Doshi
|
be6cfddc4d
|
[hotfix] multicurrency gl entry
|
2015-09-17 21:07:04 +05:30 |
|
Anand Doshi
|
bf8c8df9ce
|
Revert "[hotfix] set_balance_in_account_currency"
This reverts commit 9acd6a2629.
|
2015-09-17 20:55:50 +05:30 |
|
Anand Doshi
|
40759c284c
|
Revert "[hotfix] set_balance_in_account_currency"
This reverts commit 9acd6a2629.
|
2015-09-17 20:51:41 +05:30 |
|
Nabin Hait
|
a48d754158
|
[fix] minor issue
|
2015-09-17 20:37:07 +05:30 |
|
Anand Doshi
|
26bcd89d10
|
[hotfix] journal entry - get balance
|
2015-09-17 20:36:44 +05:30 |
|
Anand Doshi
|
20fd360a63
|
[hotfix] journal entry - get balance
|
2015-09-17 20:36:19 +05:30 |
|
Anand Doshi
|
df8efce36f
|
[hotfix] set_balance_in_account_currency
|
2015-09-17 20:29:57 +05:30 |
|
Anand Doshi
|
9acd6a2629
|
[hotfix] set_balance_in_account_currency
|
2015-09-17 20:29:31 +05:30 |
|
Nabin Hait
|
a8ef4c9220
|
[fix] minor issue
|
2015-09-17 19:38:11 +05:30 |
|
Anand Doshi
|
ce6b61b41e
|
[fix] customer naming series validation and patch to fix missing default taxes and lead
|
2015-09-17 19:02:59 +05:30 |
|
Anand Doshi
|
0332f83bc2
|
[fix] customer naming series validation and patch to fix missing default taxes and lead
|
2015-09-17 19:01:48 +05:30 |
|
Nabin Hait
|
926ae17e5a
|
Update journal_entry.py
|
2015-09-17 18:42:55 +05:30 |
|
Nabin Hait
|
8adb5f3e32
|
Update journal_entry.py
|
2015-09-17 18:40:35 +05:30 |
|
Anand Doshi
|
5532a14938
|
[hotfix] create customer contact and address from lead only on create
|
2015-09-17 18:27:56 +05:30 |
|
Anand Doshi
|
a69682c4e0
|
[hotfix] create customer contact and address from lead only on create
|
2015-09-17 18:27:36 +05:30 |
|
Anand Doshi
|
d20120e649
|
[fix] remove duplicate newsletter subscribers
|
2015-09-17 17:47:26 +05:30 |
|
Anand Doshi
|
e9b14e497b
|
[fix] remove duplicate newsletter subscribers
|
2015-09-17 17:46:40 +05:30 |
|
Anand Doshi
|
ba0bf9e13d
|
[hotfix] multicurrency patch
|
2015-09-17 17:36:20 +05:30 |
|
Anand Doshi
|
cba5a684cb
|
[hotfix] multicurrency patch
|
2015-09-17 17:36:05 +05:30 |
|
Anand Doshi
|
c439b87ccc
|
[hotfix] multicurrency patch
|
2015-09-17 17:28:58 +05:30 |
|
Anand Doshi
|
340709b2da
|
[hotfix] multicurrency patch
|
2015-09-17 17:28:39 +05:30 |
|
Nabin Hait
|
a8de61e24b
|
[fix] Multi currency patch
|
2015-09-17 17:16:58 +05:30 |
|
Nabin Hait
|
9ff52cd57e
|
[fix] Multi currency patch
|
2015-09-17 17:07:26 +05:30 |
|
Rushabh Mehta
|
e3401182c8
|
Merge pull request #4012 from saurabh6790/cart
Taxation for Shopping Cart based on Tax Rule template
|
2015-09-17 16:26:35 +05:30 |
|
Anand Doshi
|
0401e418be
|
bumped to version 6.2.0
|
2015-09-17 16:05:08 +06:00 |
|
Anand Doshi
|
ff6fd7fa9d
|
[change-log]
|
2015-09-17 15:27:01 +05:30 |
|
Anand Doshi
|
6489e97726
|
[translations]
|
2015-09-17 15:08:09 +05:30 |
|
Nabin Hait
|
77ca80217c
|
[fix] Account Currency and Balance fixed in chart of accounts #4019
|
2015-09-17 14:43:33 +05:30 |
|
Nabin Hait
|
8247ad4028
|
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
|
2015-09-17 14:40:15 +05:30 |
|
Anand Doshi
|
1194c6ef4b
|
[fix] use the new split_emails method to split emails by comma
|
2015-09-17 14:40:15 +05:30 |
|
Nabin Hait
|
87c2d1d634
|
[fix] Dashboard info in accounting currency for Customer and Supplier #4017
|
2015-09-17 14:16:01 +05:30 |
|
Anand Doshi
|
2a04d98c16
|
Merge pull request #4023 from saurabh6790/error_report
[Fixes] Check Warehouse for Company Delete and Variant Attribute Value
|
2015-09-17 13:20:05 +05:30 |
|
Anand Doshi
|
12106725fb
|
[fix] set Payment Amount in Payment Tool
|
2015-09-17 12:59:44 +05:30 |
|
Saurabh
|
5fe0086d9a
|
[Fixes] Warehouse check while company delete & Variant Attribute value check
|
2015-09-16 16:59:24 +05:30 |
|
Anand Doshi
|
0b031cdd6c
|
[fix] ignore journal entry based invoice in payment tool and payment reconciliation tool
|
2015-09-16 12:46:54 +05:30 |
|
Anand Doshi
|
c19afa140d
|
[fix] reload time log in update projects patch
|
2015-09-16 12:44:22 +05:30 |
|
Saurabh
|
0bd145a608
|
[fixes] test cases and tax rule validation
|
2015-09-15 17:06:52 +05:30 |
|
Saurabh
|
c663f5c2bd
|
[Test] test state based taxasion
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
adde1cff48
|
[Enhancement] add state ccriteria in tax rule
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
bb9427d1ef
|
[Fixes] deprecated
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
052babc6b6
|
[Fixes] [Minor] removed console statement
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
24fa06bc53
|
[Fixes] rebase conflict fixes
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
7c867ae9ad
|
[Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
8f7317175d
|
[enhancement] bring taxes from tax rules and test cases
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
957e7a37be
|
[Shopping Cart][Fixes] tax calculation based on tax rule
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
def71d4d5d
|
[Shopping Cart][Fixes] tax calculation based on tax rule
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
ef511b160e
|
Added Tax Rule under ERPNext > Accounts > Setup
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
09f9c96c53
|
Fixes in Tax Rule
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
1a2d121073
|
Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
810bd35609
|
Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
949d7dbaba
|
Added validations, test-cases to Tax Rule
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
72e6aa160c
|
Added New Doctype Tax Rule
|
2015-09-15 15:41:00 +05:30 |
|
Anand Doshi
|
69f2cc8d24
|
[fix] don't fetch template item in get items of stock reconciliation
|
2015-09-15 11:54:13 +05:30 |
|
Anand Doshi
|
86102064a5
|
[fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method
|
2015-09-15 11:50:30 +05:30 |
|
Anand Doshi
|
0fd3347148
|
[fix] handle invalid date in get_retirement_date
|
2015-09-15 11:29:51 +05:30 |
|
Anand Doshi
|
b74265c842
|
[minor] [patch] reload activity cost in default_activity_rate
|
2015-09-15 11:27:19 +05:30 |
|
Anand Doshi
|
1fef2fad2d
|
[minor] fixes in queries and payment tool
|
2015-09-14 18:27:21 +05:30 |
|
Anand Doshi
|
9345240ff1
|
Merge pull request #4007 from anandpdoshi/setup-wizard-duplicate-entry
catch DuplicateEntryError in install_fixtures step of Setup Wizard
|
2015-09-14 16:33:16 +05:30 |
|
Anand Doshi
|
dbe623b167
|
[fix] Use User Permission value as default only if the document type is Setup
|
2015-09-14 13:08:53 +05:30 |
|
Anand Doshi
|
71e51c179c
|
[fix] changed modified for multi-currency sync
|
2015-09-11 16:55:11 +05:30 |
|
Anand Doshi
|
4b8dbbdf98
|
[minor] Change modified of Sales Invoice.json
|
2015-09-11 16:39:03 +05:30 |
|
Anand Doshi
|
979326b0b1
|
minor fixes in multi-currency
|
2015-09-11 16:33:45 +05:30 |
|
Anand Doshi
|
5d9cfc76cd
|
Don't copy title field in Duplicate
|
2015-09-11 15:35:26 +05:30 |
|
Nabin Hait
|
8db7bd2d8f
|
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
|
2015-09-11 15:34:42 +05:30 |
|
Rushabh Mehta
|
d461d462aa
|
[minor] rename notified_modifed > notified_update. Merge with #1296
|
2015-09-11 15:34:41 +05:30 |
|
Anand Doshi
|
e67fa424b2
|
[fix] catch DuplicateEntryError in install_fixtures step of Setup Wizard
|
2015-09-11 15:32:06 +05:30 |
|
Anand Doshi
|
1c2636e7b3
|
Merge pull request #4003 from nabinhait/fix8
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
|
2015-09-11 15:00:13 +05:30 |
|
Anand Doshi
|
840cad0ff7
|
Don't copy title field in Duplicate
|
2015-09-11 12:26:57 +05:30 |
|
Nabin Hait
|
f76d63b92a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
[fix][patch] delete item variant attributes if no variants exists against that item
|
2015-09-10 19:26:02 +05:30 |
|
Nabin Hait
|
71ef6675ce
|
[fix] Journal Entry client side minor fixes
|
2015-09-10 19:25:50 +05:30 |
|
Anand Doshi
|
793b87948c
|
[fix] [patch] item template attributes
|
2015-09-10 18:10:15 +05:30 |
|
Nabin Hait
|
5a803d76ad
|
[fix] Bypass Root Not Editable validation from Setup Wizard
|
2015-09-10 13:20:35 +05:30 |
|
Nabin Hait
|
9513025130
|
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
|
2015-09-10 12:13:27 +05:30 |
|
Nabin Hait
|
2377cdfa4e
|
Fixed conflict
|
2015-09-09 18:45:41 +05:30 |
|
Nabin Hait
|
e3ae05aabd
|
Multi-currency: Exchange Rate in Journal Entry
|
2015-09-09 18:43:12 +05:30 |
|
Anand Doshi
|
a29577ca71
|
bumped to version 6.1.1
|
2015-09-09 19:12:48 +06:00 |
|
Anand Doshi
|
b1454cdf9f
|
[fix] fix planned qty
|
2015-09-09 18:00:09 +05:30 |
|
Anand Doshi
|
c2b4ae6667
|
bumped to version 6.1.0
|
2015-09-09 16:02:03 +06:00 |
|
Anand Doshi
|
1857bb8b0b
|
[change-log]
|
2015-09-09 15:23:16 +05:30 |
|
Anand Doshi
|
888a70c2d4
|
[fix] Setup Wizard - the case of forgetting mute emails
|
2015-09-09 15:14:54 +05:30 |
|
Anand Doshi
|
9d5b84e78a
|
Merge pull request #3996 from nabinhait/fix6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
|
2015-09-09 15:11:12 +05:30 |
|
Nabin Hait
|
f0b3014a23
|
Planned Qty logic fixed and reposted for existing
|
2015-09-09 11:04:10 +05:30 |
|
Nabin Hait
|
83dd3e14e5
|
[fix] Gross Profit report should not include return entries
|
2015-09-09 10:37:04 +05:30 |
|
Nabin Hait
|
cd103c05d6
|
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
|
2015-09-08 19:24:35 +05:30 |
|
Anand Doshi
|
bc1e8b4408
|
[minor] Unset Apply User Permissions in default permissions
|
2015-09-08 19:23:23 +05:30 |
|
Nabin Hait
|
6c3ff3e2ed
|
Fixed conflict
|
2015-09-08 18:09:03 +05:30 |
|
Nabin Hait
|
83a358afc1
|
Fix invoice outstanding where party missing
Conflicts:
erpnext/accounts/doctype/gl_entry/gl_entry.py
erpnext/patches.txt
|
2015-09-08 16:37:26 +05:30 |
|
Nabin Hait
|
96bb070781
|
Payment against invoices where party not specified
Conflicts:
erpnext/accounts/doctype/gl_entry/gl_entry.py
|
2015-09-08 16:36:44 +05:30 |
|
Nabin Hait
|
d387dd3bc6
|
[fix] Project: round percent_complete to 2 decimals
|
2015-09-08 16:15:00 +05:30 |
|
Anand Doshi
|
9f25575e0c
|
Merge pull request #3988 from nabinhait/fix2
Set expense account in stock reco only if company available
|
2015-09-08 15:59:18 +05:30 |
|
Anand Doshi
|
e1af7f1a0f
|
[minor] default mins_between_operations = 10
|
2015-09-08 15:55:09 +05:30 |
|
Anand Doshi
|
2c2868db11
|
[translations]
|
2015-09-08 15:53:54 +05:30 |
|
Anand Doshi
|
17f28c13ed
|
[fix] Customer match condition in autosuggest
|
2015-09-08 15:53:54 +05:30 |
|
Anand Doshi
|
3f1f2dd307
|
[fix] setup wizard - industry type
|
2015-09-08 15:53:53 +05:30 |
|
Anand Doshi
|
ab05dcd9f9
|
[fix] [patch] reload item attribute + value
|
2015-09-08 15:53:53 +05:30 |
|
Rushabh Mehta
|
f21edba97f
|
[fixes] to task test case and fix tree ui for mobile
|
2015-09-08 15:53:53 +05:30 |
|
Rushabh Mehta
|
91b0e2348c
|
[minor] task not mandatory for Time Log and Expense Claim #3904
|
2015-09-08 15:53:53 +05:30 |
|
Nabin Hait
|
4de91887db
|
[patch] Re-run the 'default_title' patch
|
2015-09-08 15:53:35 +05:30 |
|
Anand Doshi
|
9b1288605f
|
bumped to version 6.0.1
|
2015-09-08 15:53:05 +05:30 |
|
Nabin Hait
|
2249eea59f
|
Fixed conflict
|
2015-09-08 12:55:21 +05:30 |
|
Nabin Hait
|
d608363d7b
|
[fix] Map amount in advance payment entry agaionst SO/PO based on party account currency
|
2015-09-08 12:53:59 +05:30 |
|
Nabin Hait
|
b2739cbb79
|
Get average exchange rate in case of bank transfer
|
2015-09-08 12:18:45 +05:30 |
|
Anand Doshi
|
cba99743a4
|
[fix] Customer match condition in autosuggest
|
2015-09-07 14:51:30 +05:30 |
|
Nabin Hait
|
f44128f81c
|
Set expense account in stock reco only if company available
|
2015-09-07 10:45:15 +05:30 |
|
Nabin Hait
|
3607737b5e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
|
2015-09-07 10:41:01 +05:30 |
|
Nabin Hait
|
bf9691ed39
|
Multiple fixes
|
2015-09-07 10:40:48 +05:30 |
|
Anand Doshi
|
4df98d52c1
|
[fix] setup wizard - industry type
|
2015-09-07 10:11:23 +05:30 |
|
Anand Doshi
|
28f8664b93
|
[fix] [patch] reload item attribute + value
|
2015-09-04 16:41:27 +05:30 |
|
Nabin Hait
|
216aaaf1d6
|
Set currency and exchange rate based on Customer's currency while making Quotation from Opportunity
|
2015-09-04 16:41:04 +05:30 |
|
Nabin Hait
|
3a53d49b7e
|
[fix] Set account and party balance in Journal Entry
|
2015-09-04 15:46:47 +05:30 |
|
Nabin Hait
|
4d62d7867e
|
[report] Bank Reconciliation Statement in account currency
|
2015-09-04 13:26:45 +05:30 |
|
Nabin Hait
|
c0e3b1a0c7
|
Removed account and party balance in company currency from Journal Entry
|
2015-09-04 13:26:23 +05:30 |
|
Nabin Hait
|
34fe81f7eb
|
Patch fixed
|
2015-09-03 19:18:00 +05:30 |
|
Nabin Hait
|
11a746d363
|
Fixed conflict
|
2015-09-03 16:04:11 +05:30 |
|
Nabin Hait
|
1609933748
|
Test cases for multi currency
|
2015-09-03 16:03:07 +05:30 |
|
Nabin Hait
|
59c4ae5a46
|
[patch] Re-run the 'default_title' patch
|
2015-09-03 10:46:48 +05:30 |
|
Rushabh Mehta
|
85abdc4fad
|
[minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291
|
2015-09-03 10:29:38 +05:30 |
|
Nabin Hait
|
98096771c2
|
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
|
2015-09-03 10:28:08 +05:30 |
|
Anand Doshi
|
be090fa512
|
bumped to version 6.0.1
|
2015-09-02 19:28:14 +06:00 |
|
Rushabh Mehta
|
c2283ca304
|
[hot] [fix] remove test options in Opportunity
|
2015-09-02 18:56:35 +05:30 |
|
Rushabh Mehta
|
deb38f7a68
|
[enhancement] document management system
|
2015-09-02 18:34:24 +05:30 |
|
Anand Doshi
|
283850ce47
|
Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes
Attributes in the variant should be in the same order as in the Template
|
2015-09-02 16:09:09 +05:30 |
|
Anand Doshi
|
a6130dc918
|
bumped to version 6.0.0
|
2015-09-02 16:32:45 +06:00 |
|
Anand Doshi
|
099bbbded0
|
Attributes in the variant should be in the same order as in the Template
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
|
2015-09-02 15:56:55 +05:30 |
|
Anand Doshi
|
c3796d273c
|
[change-log]
|
2015-09-02 15:54:53 +05:30 |
|
Anand Doshi
|
28700d6404
|
Merge pull request #3973 from nabinhait/fix14
[Fix] Delete Company Transactions
|
2015-09-02 14:59:44 +05:30 |
|
Anand Doshi
|
38f400ea87
|
Merge pull request #3972 from nabinhait/fix
Item Price Fix
|
2015-09-02 14:57:26 +05:30 |
|
Anand Doshi
|
f5793fff3c
|
Merge pull request #3966 from rmehta/calendar-for-sales-order
[enhancement] calendar for sales order and other related fixes #3542
|
2015-09-02 14:52:21 +05:30 |
|
Nabin Hait
|
e1d2bef389
|
[fix] Dont delete Employee while deleting company transactions
|
2015-09-02 14:07:46 +05:30 |
|
Nabin Hait
|
0ca3e3d89e
|
[fix] Clear notification count while deleting company transactions
|
2015-09-02 13:09:48 +05:30 |
|
Nabin Hait
|
a1fa659475
|
[fix] Delete Time Logs while deleting company transactions
|
2015-09-02 12:56:29 +05:30 |
|
Nabin Hait
|
906bf64f04
|
[fix] Insert Item Price automatically based on Rate in Stock UOM
|
2015-09-02 11:32:14 +05:30 |
|
Nabin Hait
|
e52ee553c0
|
Removed debug flag
|
2015-09-02 11:32:14 +05:30 |
|
Rushabh Mehta
|
19e560e73f
|
[fix] dropbox backup check not working
|
2015-09-01 09:57:25 +05:30 |
|
Nabin Hait
|
bac9b8eef6
|
Payment Tool changes due to multi currency
|
2015-08-31 19:01:11 +05:30 |
|
Nabin Hait
|
76bb927337
|
Fixed conflict
|
2015-08-31 17:28:05 +05:30 |
|
Nabin Hait
|
699751c531
|
[report] Accounts Receivable / Payable in multi currency
|
2015-08-31 17:02:04 +05:30 |
|
Nabin Hait
|
06b15bfd63
|
[report] General Ledger in multi currency
|
2015-08-31 15:39:03 +05:30 |
|
Rushabh Mehta
|
8f1391dc96
|
[enhancement] calendar for sales order and other related fixes #3542
|
2015-08-31 12:42:45 +05:30 |
|
Nabin Hait
|
1901ca5a45
|
[fix] Fixed gross profit report due to removal of designation field from Sales Team table
|
2015-08-31 12:02:50 +05:30 |
|
Nabin Hait
|
c68f68d6cc
|
[fix] Patch fixed for account_currency field rename
|
2015-08-28 19:26:28 +05:30 |
|
Nabin Hait
|
6e439a5e53
|
Multi currency: test case and fixes
|
2015-08-28 19:24:22 +05:30 |
|
Anand Doshi
|
3d9d2d1dd1
|
Exported all doctypes
|
2015-08-27 17:04:39 +05:30 |
|
Anand Doshi
|
3ea7ce84ed
|
[fix] print hide additional discount, reload doctypes in sales return patch
|
2015-08-27 17:04:39 +05:30 |
|
Anand Doshi
|
002049eb85
|
[minor] show Inventory section for new Item if Maintain Stock is checked
|
2015-08-27 17:04:06 +05:30 |
|
Anand Doshi
|
57a51351d3
|
[fix] Changed more section label to 'More Information'
|
2015-08-27 17:04:06 +05:30 |
|
Anand Doshi
|
77a2107973
|
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
|
2015-08-27 17:04:05 +05:30 |
|
Rushabh Mehta
|
c5346c99de
|
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
|
2015-08-27 17:03:37 +05:30 |
|
Nabin Hait
|
78be566428
|
minor fix
|
2015-08-27 16:27:44 +05:30 |
|
Nabin Hait
|
f6f38f2f2d
|
[new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account
|
2015-08-27 16:27:33 +05:30 |
|
Nabin Hait
|
9a9a4293b3
|
[new fields] Party Account Currency, Paid Amount and Write Off Amount in Acompany Currency
|
2015-08-27 16:26:38 +05:30 |
|
Nabin Hait
|
09c68c9ad0
|
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
|
2015-08-27 14:55:55 +05:30 |
|
Nabin Hait
|
13d8835b75
|
Fixed merge conflict
|
2015-08-27 14:55:34 +05:30 |
|
Anand Doshi
|
b8610e1079
|
[fix] removed update_stock_ledger from delivery note
|
2015-08-27 14:46:47 +05:30 |
|
Anand Doshi
|
41e948b00a
|
[hotfix] update reserved quantity in delivery note
|
2015-08-27 14:42:25 +05:30 |
|
Nabin Hait
|
2091f0c97e
|
Checked out json files from upstream
|
2015-08-27 14:35:17 +05:30 |
|
Anand Doshi
|
c6802ca6d0
|
[minor] show Inventory section for new Item if Maintain Stock is checked
|
2015-08-27 13:21:43 +05:30 |
|
Anand Doshi
|
282e4947fa
|
[fix] Changed more section label to 'More Information'
|
2015-08-27 13:11:46 +05:30 |
|
Nabin Hait
|
54fe26dcfb
|
[patch] Multi currency
|
2015-08-27 12:55:24 +05:30 |
|
Nabin Hait
|
4ffd7f3d05
|
Outstanding, paid and write-off amount in Invoice
|
2015-08-27 12:28:36 +05:30 |
|
Nabin Hait
|
a12d959729
|
GL Entries for Sales/Purchase Invoice in multi currency
|
2015-08-27 12:27:24 +05:30 |
|
Anand Doshi
|
b99c180466
|
Merge branch 'rmehta-validation-settings' into develop
|
2015-08-27 12:22:06 +05:30 |
|
Anand Doshi
|
6cf193d432
|
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
|
2015-08-27 12:21:17 +05:30 |
|
Nabin Hait
|
35a5c87cbf
|
[fix] Clear notifications for Sales / Purchase Order on stop/unstop
|
2015-08-27 12:06:11 +05:30 |
|
Rushabh Mehta
|
740db53b86
|
[fix] returned_qty reapply and change-log
|
2015-08-27 12:00:16 +05:30 |
|
Anand Doshi
|
69b6195d3b
|
Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
|
2015-08-27 11:39:20 +05:30 |
|
Rushabh Mehta
|
cd2d8a0410
|
[merge] re-applied changes to sales invoice & delivery note
|
2015-08-27 11:05:26 +05:30 |
|
Rushabh Mehta
|
5bec301929
|
Merge branch 'layout-cleanup' into develop
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
erpnext/stock/doctype/delivery_note/delivery_note.json
|
2015-08-27 11:01:39 +05:30 |
|
Rushabh Mehta
|
491df14426
|
[minor] catch invalid item code in pricing list (via support ticket)
|
2015-08-27 10:31:28 +05:30 |
|
Rushabh Mehta
|
00eba4d7f6
|
[minor] show price list in sales order (via support ticket)
|
2015-08-27 10:25:07 +05:30 |
|
Rushabh Mehta
|
17679c6902
|
[layout cleanup] purchase, stock, journal entry
|
2015-08-26 22:20:38 +05:30 |
|
Anand Doshi
|
fa65c7bf29
|
[minor] stopped or cancelled message
|
2015-08-26 19:15:24 +05:30 |
|
Rushabh Mehta
|
f7800c053b
|
[layout cleanup] in Quotation, Sales Order, Delivery Note
|
2015-08-26 18:53:37 +05:30 |
|
Anand Doshi
|
eed8906a1e
|
bumped to version 5.8.2
|
2015-08-26 18:27:24 +06:00 |
|
Anand Doshi
|
414248b792
|
[fix] event creation on Contact Date
|
2015-08-26 17:56:55 +05:30 |
|
Anand Doshi
|
28d53be50c
|
bumped to version 5.8.1
|
2015-08-26 18:13:26 +06:00 |
|
Anand Doshi
|
cb2f9a863d
|
[hotfix] reload Sales and Purchase Order Item
|
2015-08-26 17:42:40 +05:30 |
|
Anand Doshi
|
2b6bdc1edb
|
[fix] filter and validation of Debit To and Credit To accounts
|
2015-08-26 17:42:40 +05:30 |
|
Anand Doshi
|
8ca72d8883
|
bumped to version 5.8.0
|
2015-08-26 17:25:08 +06:00 |
|
Anand Doshi
|
ab9f03d557
|
Merge pull request #3952 from neilLasrado/variant-duplication
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
|
2015-08-26 16:52:25 +05:30 |
|
Anand Doshi
|
7fa8fb984e
|
[fix] Show write off account
|
2015-08-26 16:48:41 +05:30 |
|
Anand Doshi
|
f29628072f
|
[change-log]
|
2015-08-26 14:50:05 +05:30 |
|
Anand Doshi
|
cb3a4caa44
|
[fix] removed validate due date in Journal Entry
|
2015-08-26 14:50:04 +05:30 |
|
Neil Trini Lasrado
|
755f1f6841
|
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
|
2015-08-26 12:59:29 +05:30 |
|
Anand Doshi
|
80a784fdc5
|
Merge pull request #3943 from nabinhait/fix4
[fix] Print Delivery Note without amount
|
2015-08-26 12:29:24 +05:30 |
|
Rushabh Mehta
|
678a4e24ff
|
[cleanup] Opportunity
|
2015-08-26 12:27:25 +05:30 |
|
Rushabh Mehta
|
b8a6f40370
|
[cleanup] layouts of item, customer, supplier, lead
|
2015-08-26 10:51:45 +05:30 |
|