Saurabh
|
1b62ecea44
|
[enhancement] cheque print
|
2016-05-24 10:28:14 +05:30 |
|
Nabin Hait
|
79ddf67289
|
Merge pull request #5362 from nabinhait/budget
Budgeting
|
2016-05-23 17:56:42 +05:30 |
|
Nabin Hait
|
8f70370457
|
Chart of accounts fixed for Spain
|
2016-05-23 17:41:51 +05:30 |
|
Nabin Hait
|
03b08e7a91
|
[fix] Period closing voucher
|
2016-05-23 16:28:39 +05:30 |
|
Nabin Hait
|
832988e2fd
|
test case fixed
|
2016-05-23 13:04:26 +05:30 |
|
Nabin Hait
|
ca90963d5b
|
Redesigned budgets
|
2016-05-23 13:04:26 +05:30 |
|
Nabin Hait
|
b9bc7d6df3
|
[feature] New document for Budget
|
2016-05-23 13:04:26 +05:30 |
|
Rushabh Mehta
|
d0cee1b61b
|
[fix] minor fixes to pos
|
2016-05-20 12:54:59 +05:30 |
|
Rushabh Mehta
|
40b3a5bcc4
|
[optimize] communication query for heatmap
|
2016-05-20 12:54:59 +05:30 |
|
Nabin Hait
|
563bd056d7
|
Merge branch 'master' into develop
|
2016-05-20 12:18:28 +05:30 |
|
Nabin Hait
|
3956c94bbb
|
Merge pull request #5340 from rohitwaghchaure/support_week_new
[Fix] Sales Invoice shows default date while no default mentioned
|
2016-05-20 12:06:22 +05:30 |
|
Nabin Hait
|
5dfcfc5606
|
Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco
[fixes] set default bank account in bank reconciliation statement report
|
2016-05-20 11:36:44 +05:30 |
|
Rushabh Mehta
|
532eedf411
|
[enhance] more editable grids
|
2016-05-19 18:22:49 +05:30 |
|
Rohit Waghchaure
|
d818bcd888
|
[Fixes] tax rule, tax rule working even if tax template inside the rule is disabled.
|
2016-05-19 16:53:01 +05:30 |
|
Saurabh
|
c0c8af06da
|
[fixes] set default bank account in bank reconciliation statement report
|
2016-05-19 12:32:08 +05:30 |
|
Nabin Hait
|
1daebc04d0
|
Merge pull request #5360 from neilLasrado/hotfix
Fixed reports
|
2016-05-18 10:39:19 +05:30 |
|
Neil Trini Lasrado
|
4668a69cf5
|
Fixed reports
|
2016-05-17 19:04:08 +05:30 |
|
Rohit Waghchaure
|
5d97d89a03
|
[Fix] Sales Invoice shows default date while no default mentioned
|
2016-05-17 15:13:17 +05:30 |
|
Nabin Hait
|
a09285122f
|
Added root type for Income. Fixes #5356
|
2016-05-17 10:37:31 +05:30 |
|
Rushabh Mehta
|
72615977d7
|
Merge pull request #5337 from rohitwaghchaure/pos
[WIP] [POS] Some changes and fixes
|
2016-05-16 12:06:42 +05:30 |
|
Rohit Waghchaure
|
e0934d118f
|
[Fixes] Some changes and fixes
|
2016-05-16 12:01:16 +05:30 |
|
Nabin Hait
|
665568d87e
|
ignore permissions while creating records from charts builder portal
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
a21f49dd94
|
Tax rate in chart of accounts
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
e4670a9a45
|
Cleaned up chart of accounts
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
825070e504
|
Merge pull request #5331 from nabinhait/multi-fix-55
Multiple fixes
|
2016-05-12 12:27:42 +05:30 |
|
Anand Doshi
|
19fec06366
|
[fix] Validate Company in Account autoname
|
2016-05-11 13:27:18 +05:30 |
|
Nabin Hait
|
b81ed45b2b
|
fixed conflict
|
2016-05-11 12:52:31 +05:30 |
|
Nabin Hait
|
b3a0e05bae
|
included path fixed in report print formats
|
2016-05-11 12:38:11 +05:30 |
|
Nabin Hait
|
a1ec7f1eed
|
Add root account
|
2016-05-11 12:38:11 +05:30 |
|
Nabin Hait
|
3323d06be0
|
Mode of Payment columns and filters added in sales/purchase register
|
2016-05-10 13:17:02 +05:30 |
|
Rohit Waghchaure
|
6087fe178e
|
[Enhancement] POS
|
2016-05-09 23:36:15 +05:30 |
|
Nabin Hait
|
332d29f166
|
Merge branch 'master' into develop
|
2016-05-06 16:13:35 +05:30 |
|
shreyas
|
c2a49211a5
|
[Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers'
|
2016-05-05 15:56:48 +05:30 |
|
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 |
|