shreyas
622fe3f1e3
[Fix] Fetch due date for Sales/Purchase invoice in payment tool
2016-05-05 15:11:04 +05:30
Rushabh Mehta
c711b82889
Merge pull request #5296 from KanchanChauhan/websitemakeover
...
New look to the website
2016-05-02 15:54:41 +05:30
Nabin Hait
863cb12426
minor fix
2016-05-02 13:48:27 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Nabin Hait
b78adcf279
Merge branch 'master' into develop
2016-04-29 18:26:46 +05:30
Neil Trini Lasrado
c33b5b74c6
Itemwise purchase and Itemwise sales
2016-04-29 18:21:51 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Nabin Hait
6146cc1e33
Merge branch 'master' into develop
2016-04-29 11:44:55 +05:30
Nabin Hait
48577c15a2
Show all scheduled depreciation in dotted line
2016-04-28 18:12:41 +05:30
Nabin Hait
70f05df075
Asset Movement
2016-04-28 18:01:32 +05:30
Nabin Hait
ce35c56cd3
Added line graph in asset dashboard
2016-04-28 18:01:32 +05:30
Nabin Hait
92426f5e56
Added Image field in Asset
2016-04-28 18:01:32 +05:30
Nabin Hait
314246939f
[report][fix] Item-wise tax calculation if item appears multiple times in the same invoice
2016-04-28 17:32:36 +05:30
Nabin Hait
b7b7f0062d
[report][fix] Consider taxes only the tax contributed in invoice total
2016-04-28 17:31:27 +05:30
Anand Doshi
79c536acb5
Merge branch 'master' into develop
2016-04-27 15:44:11 +05:30
Anand Doshi
b5e700f3af
Merge pull request #5248 from saurabh6790/hotfix
...
[fixes] raise exception on deletion of fiscal year if fiscal year is set as Default
2016-04-27 14:25:58 +05:30
Neil Trini Lasrado
4c95ed49ed
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
2016-04-27 13:09:17 +05:30
Saurabh
9be40ee7c3
[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found
2016-04-27 12:58:40 +05:30
Anand Doshi
c6479bcbb6
Merge pull request #5264 from neilLasrado/hotfix
...
Fixed Currency Symbol in Trial Balance and Trial Balance for Party re…
2016-04-27 12:32:05 +05:30
Neil Trini Lasrado
b93d525c96
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
2016-04-25 17:18:52 +05:30
Rushabh Mehta
621283c5c5
[enhancement] stock balance page
2016-04-21 19:00:34 +05:30
Rushabh Mehta
202cb7cdf1
Merge pull request #5249 from nabinhait/fixed_asset
...
Fixed asset
2016-04-21 11:41:11 +05:30
Nabin Hait
595d3c03ef
updated docs for fixed asset
2016-04-20 18:17:05 +05:30
Nabin Hait
85a2776e91
Depreciation Schedule considering already booked depreciations for existing asset and testcases
2016-04-20 17:57:12 +05:30
Nabin Hait
318fa287df
[report] Asset Depreciations and Balances
2016-04-20 17:57:12 +05:30
Nabin Hait
e58c26edca
[report] Added asset depreciation ledger report
2016-04-20 17:57:12 +05:30
Nabin Hait
cd0e8ce8ad
Fixes and modification in fixed asset
2016-04-20 17:57:12 +05:30
Nabin Hait
3d9c5c0c20
Fixed Asset module cleanup and fixes
2016-04-20 17:57:11 +05:30
Kanchan Chauhan
11638ba358
Changes 3
2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952
Changes 2
2016-04-20 16:24:24 +05:30
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
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
Umair Sayyed
72534deea2
removed Is Sales Item and Is Purchase Item
2016-04-15 12:57:00 +05:30
Nabin Hait
bd07ea43e8
fixed conflict
2016-04-15 11:06:41 +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
Rushabh Mehta
8c9c57c8f3
[minor] update party timestamp after transaction
2016-04-13 18:22:06 +05:30
Nabin Hait
c2ae1a7375
fixed merge conflict
2016-04-13 11:55:15 +05:30
Rushabh Mehta
8bbca6fa2e
[enhancement] links menu in customer, supplier, item
2016-04-12 19:16:33 +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
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
Rushabh Mehta
5d0e8dee11
[fix] dashboard for customer, supplier
2016-04-11 17:34:49 +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
f945e10cce
Currency column in AR/AP and sales/purchase register report
2016-04-11 11:56:57 +05:30
Rushabh Mehta
2dff9275f3
[test] fixed circular dependencies
2016-04-08 18:05:12 +05:30
Anand Doshi
2f957f27b0
[fix] apply Tax Rule for lead
2016-04-08 17:43:08 +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
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
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
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
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
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
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
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
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
Nabin Hait
2ed0b59747
[fix] Added overlap validation in fiscal year
2016-03-31 12:40:37 +05:30
Nabin Hait
91a58808c0
[fix] Allowed deletion of root account
2016-03-31 11:59:10 +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
Rushabh Mehta
3fc6fdeba0
[cleanup] for quick-entry
2016-03-30 13:18:30 +05:30
Rushabh Mehta
652dee45a6
[minor] make margin collapsible
2016-03-29 16:42:13 +05:30
Rushabh Mehta
1d05ada5e9
Merge pull request #4950 from nabinhait/fixed_asset_depreciation
...
Fixed asset depreciation
2016-03-29 16:39:31 +05:30
Rushabh Mehta
22fe3a8b7e
Merge pull request #5081 from nabinhait/trans_fix
...
[fix] Translations
2016-03-29 15:16:07 +05:30
Rushabh Mehta
b5aa50de06
[fix] select default company in chart of accounts
2016-03-29 14:41:20 +05:30
Nabin Hait
d9449e396f
[fix] Translations
2016-03-29 13:22:31 +05:30
Rushabh Mehta
c9850f9e04
Merge pull request #5077 from frappe/master
...
Master
2016-03-29 11:59:32 +05:30
Nabin Hait
fb03b96992
fixed asset fixes
2016-03-29 11:54:38 +05:30
Nabin Hait
7de15321c9
[docs] Managing fixed assets
2016-03-29 11:54:38 +05:30
Nabin Hait
06a41aca13
fixed asset: related accounts added in default chart of accounts
2016-03-29 11:54:37 +05:30
Nabin Hait
7536349f17
Fixed asset: status, restore, testcase and much more
2016-03-29 11:54:37 +05:30
Nabin Hait
4d668dbaa3
[tests] creation of asset and asset category
2016-03-29 11:54:37 +05:30
Nabin Hait
4fdb05228d
fixed asset depreciation
2016-03-29 11:54:37 +05:30
Nabin Hait
3a15c92c5e
Fixed Asset Depreciation first commit
2016-03-29 11:54:37 +05:30
Rushabh Mehta
9904c5acf4
Merge pull request #5050 from neilLasrado/develop
...
Fixes Translations
2016-03-29 10:51:44 +05:30
Rushabh Mehta
e1b20a0b29
Merge pull request #5044 from rohitwaghchaure/add_margin_feature
...
[Enhancement] Add margin in sales flow.
2016-03-28 18:27:05 +05:30
rohitwaghchaure
a1064a6149
[enhancement] request for quotation
2016-03-28 17:28:45 +05:30
Neil Trini Lasrado
b176dea74e
Fixed issues in Pricing Rule if multiple pricing rules existed with same priority
2016-03-28 13:23:47 +05:30
Neil Trini Lasrado
b6d9946854
Fixes Translations
2016-03-28 12:44:05 +05:30
Rushabh Mehta
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:22:17 +05:30
mbauskar
a52472cf5b
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
2016-03-24 14:07:51 +05:30
mbauskar
c1331d0e8e
[minor-fix] pricing rule test-case fix
2016-03-24 14:07:51 +05:30
mbauskar
75b6fbb6a7
[fix] apply pricing rule added type and rate on ignore pricing rule trigger
2016-03-24 14:07:50 +05:30
mbauskar
b6d19bcfc2
[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item
2016-03-24 14:07:50 +05:30
mbauskar
dcd8b7773d
[fix] calculated rate on py side, added depends on for sales order item
2016-03-24 14:07:50 +05:30
mbauskar
5e76a1cffa
[fix] added eval for total margin and margin rate field
2016-03-24 14:07:50 +05:30
mbauskar
ea60c635ab
changed the description of rate fields depending on margin type and if ignore pricing is unchecked returned the rate=0
2016-03-24 14:07:48 +05:30
mbauskar
8c8fa17a9b
[new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item
2016-03-24 14:07:48 +05:30
Rushabh Mehta
b2269dd326
[fix] back links from project web view
2016-03-23 18:29:00 +05:30
Anand Doshi
a75fe1a4c3
Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"
2016-03-23 11:59:24 +05:30
Rushabh Mehta
eec21d041c
Merge pull request #5028 from anandpdoshi/paypal-cleanup
...
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-23 11:50:46 +05:30
Rushabh Mehta
1e7ca6c77a
Merge pull request #5023 from nabinhait/balance_sheet_opening
...
[fix][balance sheet] Check if precious fiscal year is closed
2016-03-23 11:46:13 +05:30
Anand Doshi
71b90b7b7d
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-21 17:50:02 +05:30
Nabin Hait
c8baa01e9c
[fix] Updated modified datetime
2016-03-21 17:20:03 +05:30
Nabin Hait
443a7c13e4
[fix][balance sheet] Check if previous fiscal year is closed
2016-03-21 14:38:32 +05:30
Nabin Hait
9a75530c26
[fix] reload doctype for renaming project
2016-03-18 16:19:25 +05:30
Nabin Hait
d6c59656e8
Merge pull request #5009 from saurabh6790/cart_fixes-1.0
...
[fixes] return debtors account name
2016-03-18 15:36:06 +05:30
Nabin Hait
5996b2f1bb
[fix] recurring document logic
2016-03-18 15:19:54 +05:30
Saurabh
b43df36e85
[fixes] return debtors account name
2016-03-18 15:05:50 +05:30
rohitwaghchaure
90ff509f6d
[fix]Earlier recurring billing
2016-03-18 10:44:53 +05:30
Umair Sayyed
8cbc076dc2
fixes in the Account Receivale print format - with Nabin
2016-03-17 15:12:31 +05:30
Nabin Hait
6221117069
[fix] shipping address position in document
2016-03-16 16:23:30 +05:30
Saurabh
14d646f636
[fixes] shipping address on purchase flow
2016-03-16 16:23:30 +05:30
Neil Trini Lasrado
f433a5a124
Fixed bug while selecting project in sales_invoice, sales_order, delivery_note
2016-03-16 16:00:27 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Nabin Hait
f853a92676
Fixes in AR/AP Print Format
2016-03-15 16:10:15 +05:30
Nabin Hait
89301863e5
minot fixes
2016-03-15 15:20:49 +05:30
rohitwaghchaure
c54b805981
[fixes]Unable set recurring date in sales order
2016-03-14 19:03:22 +05:30
Saurabh
c54619570a
[fixes] check party_account_currency while creating Pull Request from Sales Invoice
2016-03-14 15:55:23 +05:30
Saurabh
9f94266892
[fixes] fetch value from grand total field while creating payment request from si
2016-03-14 11:23:03 +05:30
Anand Doshi
c75c1d7e3e
[fix] additional fixes after deprecating Fiscal Year
2016-03-11 14:56:19 +05:30
Valmik Jangla
063946a02f
Removed from Purchase Invoice and Purchase Reciept
2016-03-11 13:07:48 +05:30
Valmik Jangla
d89dcf60e6
Removed from Delivery Note and Appraisal
...
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
2016-03-11 13:07:48 +05:30
Valmik Jangla
d4ac3d8ceb
Removed from Stock Ledger Entry and Sales Invoice
2016-03-11 13:07:48 +05:30
Valmik Jangla
cd9daf6671
Removed from Journal Entry and Stock Reconciliation
2016-03-11 13:07:16 +05:30
Valmik Jangla
c7e774fda9
BudgetError Fix
2016-03-11 13:05:20 +05:30
Valmik Jangla
865d547965
Removed from GL Entry, Opportunity and Quotation
2016-03-11 13:05:20 +05:30
Valmik Jangla
bc60970fcb
Removed from Maitenance Visit and Warranty Claim
2016-03-11 13:05:19 +05:30
Valmik Jangla
57b69cecbf
Removed from C-Form
2016-03-11 13:05:19 +05:30
Valmik Jangla
c4c603dcd2
Removed from Expense Claim
2016-03-11 13:05:19 +05:30
shreyas
6c89bb1900
[Minor] Moved company field to top of the form, making it more consistent other doctypes
2016-03-11 12:12:30 +05:30
Anand Doshi
f0e16e68c5
Merge pull request #4962 from nabinhait/trial_balance_fix
...
[fix] Trial Balance report, showing rows with zero values
2016-03-10 12:24:24 +05:30
Nabin Hait
3883e86ad7
[fix] Trial Balance report, showing rows with zero values
2016-03-10 12:01:01 +05:30
Nabin Hait
dd8dbe000b
[fix] Rearranged position of mode_of_payment in sales invoice
2016-03-10 10:58:31 +05:30
Anand Doshi
065d24b26d
Merge pull request #4951 from shreyasp/gross-profit-wn-sup17486
...
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
2016-03-09 14:22:16 +05:30
shreyas
7c42995949
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
2016-03-09 13:15:38 +05:30
Nabin Hait
acb28954ff
[fix][report] Show group rows with zero values if there are values against children
2016-03-04 12:32:44 +05:30
Rushabh Mehta
0c1b8f4334
[fix] [minor] autoload chart of accounts
2016-03-03 16:47:36 +05:30
Rushabh Mehta
1396b776bc
[fix] print hide for submit_on_creation
2016-03-03 13:57:15 +05:30
Rushabh Mehta
7114b7786e
[fix] print hide for submit_on_create
2016-03-03 13:12:21 +05:30
Rushabh Mehta
5839a8d7f0
[fixes] usability cleanup of recurring document and added explicit submit_on_creation
2016-03-02 17:51:52 +05:30
Rushabh Mehta
aac4dcedc8
[fix] print language and contact_email fields and removed translations
2016-03-02 15:45:09 +05:30
Rushabh Mehta
b0f0aaf5b1
[minor] added chart of accounts, cost centers buttons on Company
2016-03-02 13:08:40 +05:30
Rushabh Mehta
cbed331047
Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test
...
Multilingual print format test
2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92
[enhancement] Multi-lingual print format
2016-03-01 16:33:08 +05:30
Rushabh Mehta
39a6f804bf
Merge pull request #4871 from ShashaQin/patch-27
...
Improvements about recurring documents
2016-03-01 16:06:33 +05:30
Rushabh Mehta
ddeb576d52
Merge pull request #4849 from rasos/patch-1
...
Create at_austria_chart_Einheitskontenrahmen.json
2016-03-01 16:05:13 +05:30
Nabin Hait
bdf0f0a08d
[fix] Show debit note button in purchase invoice
2016-02-26 16:26:28 +05:30
Nabin Hait
0f6eac3b35
[fix] Show credit note button in sales invoice
2016-02-26 13:01:32 +05:30
Nabin Hait
55f0834e99
[fix] Show payment button in purchase invoice
2016-02-25 19:12:37 +05:30
ShashaQin
ae629ad29f
Update purchase_invoice.json
2016-02-25 11:17:13 +08:00
ShashaQin
02a38e8b5e
Update sales_invoice.json
...
Add 'Notify by Email' check box and set next_date can be changed by user
2016-02-25 11:13:19 +08:00
Saurabh
00212a23e1
[fixes] removed base_grand_total from payment request
2016-02-24 16:50:19 +05:30
Saurabh
6d1dbd6384
[fixes] currency exchange rate and payment gateway account fixes for multicurrency
2016-02-24 15:07:26 +05:30
Saurabh
4a6bbf9b72
[fixes] added filters company and currency to get account, removed account name wise comparison
2016-02-24 15:07:26 +05:30
Saurabh
f54be2c7f0
[fixes] test case fixes for multi-currency check
2016-02-24 15:07:25 +05:30
Saurabh
1864879b91
[fixes] fix grand total calculation for Payment Request and set visibility of Resend Payment Email button
2016-02-24 15:07:25 +05:30
Saurabh
3a2682919a
[enhance] set customer payable account to new customer as per payment gateway account currency via cart if cart and checkout is enable
2016-02-24 15:07:25 +05:30
Saurabh
2dc2d671da
[clean-up]
2016-02-24 15:07:25 +05:30
Saurabh
7d5b47e113
[fixes] minor fix in test-case
2016-02-24 15:07:25 +05:30
Saurabh
fa32588e72
[fixes] minor fix in test-case
2016-02-24 15:07:25 +05:30
Saurabh
1e800a9ef0
[fixes] multi-currency via payment request
2016-02-24 15:07:25 +05:30
Saurabh
da9e9cdb13
[fixes] minor get_payment_gateway_account
2016-02-24 15:07:24 +05:30
Saurabh
dca6302e15
[fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment
2016-02-24 15:07:24 +05:30
Saurabh
883cc04701
[fixes] compare attributes in lower case
2016-02-24 15:07:24 +05:30
Anand Doshi
acd1bcffde
[fix] changed field type to Code
2016-02-24 12:38:08 +05:30
Nabin Hait
d2d261dc87
Merge pull request #4854 from patilsangram/develop
...
Removed Stop Button from SO and PO
2016-02-24 11:21:17 +05:30
patilsangram
a812d67837
[fixes]
2016-02-23 19:04:29 +05:30
saurabh
8e49951821
fetch customer or supplier language and set on sales and purchase flow's form
2016-02-23 02:17:03 +05:30
saurabh
65820ed013
added new field language for users
2016-02-23 02:17:03 +05:30
patilsangram
bf2b511988
[Removed Stop Button from SO and PO]
2016-02-22 16:24:23 +05:30
Nabin Hait
db746f5bc7
[fix] Condition for Payment and Return button visibility
2016-02-22 16:17:10 +05:30
Roland
ed2849adf9
Create at_austria_chart_Einheitskontenrahmen.json
...
Austrian Chart of Accounts compiled by fairkom.eu from various sources, among them the official "Österreichishcer Kontenrahmen" published by ÖPWZ - Fachsenat für Betriebswirtschaft und Organisation der Kammer der Wirtschaftstreuhänder Version May 2014. Numbering scheme has been slightly adapted to fit best with ERPnext setup of a company, where the most important accounts are automatically assigned. When using this chart of accounts, feel free to reduce / adapt the accounts - it is not legally binding.
2016-02-22 09:26:54 +01:00
Anand Doshi
52780cb937
Merge pull request #4841 from nabinhait/escape
...
[fix] Escaping strings with percentage
2016-02-19 13:01:00 +05:30
Nabin Hait
1a99cb8bfe
[fix] Escaping strings with percentage
2016-02-19 12:45:57 +05:30
Nabin Hait
fb24a27201
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-18 19:18:07 +05:30
Anand Doshi
828d5ffaab
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-17 18:31:58 +05:30
Anand Doshi
620252cadb
[fix] validate Fiscal Year in Trial Balance
2016-02-15 12:03:04 +05:30
Rushabh Mehta
6f574cd60f
[minor] do not commit pay-to-recd from in journal entry
2016-02-11 14:27:28 +05:30
Nabin Hait
7e02831897
[fix] Test case fixed
2016-02-10 15:54:52 +05:30
Nabin Hait
e1f6e60cea
[fix] Payment Request Fixes
2016-02-10 13:07:42 +05:30
Rushabh Mehta
7f3983a3d6
Merge pull request #4769 from rmehta/pricing-rule-on-variant
...
[fix] pricing rule for variant, if rule for template available, use it
2016-02-09 11:20:00 +05:30
Rushabh Mehta
faf9b589c4
[fix] pricing rule for variant, if rule for template available, use it
2016-02-08 18:49:27 +05:30
Nabin Hait
4c6af87ad0
[fix] Read permission to All for permlevel 1 fields
2016-02-08 16:56:19 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Nabin Hait
2b8472fe54
Merge pull request #4744 from ccfiel/develop
...
undo bank recon.
2016-02-08 10:45:55 +05:30
Chris Ian Fiel
af667f77e6
Update bank_reconciliation.py
...
set to null if clearance_date is blank because if not it will set it just 0000-00-00.
2016-02-04 22:10:36 +08:00
ShashaQin
bcc56a4557
Update gross_profit.py
...
Gross Profit report improvement
2016-02-04 11:45:00 +08:00
Nabin Hait
bd7f48cfd4
[report] Financial Statements: Accumulated periodic balance based on filters
2016-02-02 19:05:43 +05:30
ShashaQin
cc6ce5beac
Update financial_statements.py
2016-02-02 19:05:42 +05:30
ShashaQin
15d7224335
Update balance_sheet.py
2016-02-02 19:05:42 +05:30
ShashaQin
1f51e71827
Update profit_and_loss_statement.py
2016-02-02 19:05:42 +05:30
Nabin Hait
d5fda57297
[fix] Ignore permissions and made Customer warehouse field hidden in selling cycle
2016-02-01 15:55:09 +05:30
Anand Doshi
7c0a58ac3f
[fix] show formatted currency value in advance paid validation
2016-01-29 12:16:24 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
shreyas
eba9ca4d66
[Minor]Change to maintain args ordering convention
2016-01-26 16:29:26 +05:30
shreyas
79872bf62c
[Refactor]Changed variable name to avoid conflict between args and local variable
2016-01-26 13:57:06 +05:30
shreyas
c8ac3b042b
[Minor]Refactored code for better readability
2016-01-26 13:23:38 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
323dc96c99
[Travis] Fixed reference failure in party.py
2016-01-25 18:19:14 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
2ea5c6913d
Merge pull request #4685 from shreyasp/supplier-credit-fix
...
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 17:58:21 +05:30
Anand Doshi
5dcb40bc96
Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy
...
[fix] obey no_copy while creating recurring documents
2016-01-25 17:27:04 +05:30
Anand Doshi
c07489a096
[fix] Journal Entry: init debit/credit in account currency
2016-01-25 17:23:36 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
shreyas
28a6578ba2
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 12:44:14 +05:30
Nabin Hait
568054ab96
[fix] Make Delivery Note from Sales Invoice
2016-01-21 18:50:28 +05:30
Nabin Hait
bb7e499cbd
Merge pull request #4662 from ccfiel/develop
...
undo reconciled journal entry record
2016-01-21 15:32:33 +05:30
Chris Ian Fiel
cb66d3a8c9
undo reconciled journal entry record
...
https://github.com/frappe/erpnext/issues/4661
2016-01-21 16:26:22 +08:00
Chris Ian Fiel
43a62ad0f0
undo reconciled journal entry record
2016-01-21 06:50:13 +08:00
Nabin Hait
002fa6c1d9
Merge pull request #4650 from RicardoJohann/patch-2
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 17:03:06 +05:30
Nabin Hait
dbbc3eb8a6
Merge pull request #4656 from nabinhait/gle_rounding
...
[fix] Round off gle due to currency conversion
2016-01-20 16:48:42 +05:30
Nabin Hait
dd2f0330a6
Merge pull request #4641 from nabinhait/report-currency
...
[fix] Currency in Gross Profit report
2016-01-20 16:45:57 +05:30
Nabin Hait
d4507ac6a0
[fix] Round off gle due to currency conversion
2016-01-20 16:14:27 +05:30
RicardoJohann
05aa3b391e
Update bank_reconciliation.py
2016-01-20 13:38:20 +08:00
RicardoJohann
e095eeb084
Update bank_reconciliation_statement.py
2016-01-20 13:36:36 +08:00
RicardoJohann
6f9afffd8a
Update bank_reconciliation_statement.html
2016-01-20 12:15:20 +08:00
RicardoJohann
7425af6968
Update bank_reconciliation_detail.json
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 12:02:20 +08:00
Nabin Hait
6d8688f8b4
[fix] Currency in Gross Profit report
2016-01-19 17:27:06 +05:30
Nabin Hait
34d2822483
Fixes in get_item_details and test cases
2016-01-19 16:48:32 +05:30
Nabin Hait
77532cc8db
[fix] Total Amount in Journal Entry
2016-01-19 16:48:31 +05:30
Maxwell
4da17348fd
Add localization in the on_submit event
2016-01-18 23:29:21 -02:00
Rushabh Mehta
6bf3c7453b
[fix] payment request
2016-01-18 14:29:26 +05:30
Rushabh Mehta
681c9dde84
[ui] payment request cleanup
2016-01-18 14:21:45 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Rushabh Mehta
2e3d2b8426
Merge pull request #4613 from nabinhait/fixes
...
[fix] Item query and exchange rate
2016-01-15 11:19:44 +05:30
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Nabin Hait
ad42d2f67a
Minor fixes
2016-01-15 11:09:41 +05:30
Saurabh
f7caad8ecb
[fixes] redirect uri fixes
2016-01-14 11:30:47 +05:30
Nabin Hait
a88912a2f5
[fix] Item query and exchange rate
2016-01-14 10:43:17 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Saurabh
cbebb4b8ba
[fixes] code cleanup
2016-01-12 14:13:35 +05:30
Saurabh
3ade883fd9
[fixes] place cart button via js
2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
2016-01-12 14:09:52 +05:30
Saurabh
a940b6d149
[fixes] handle cancled payment requests
2016-01-12 14:09:51 +05:30