7100 Commits

Author SHA1 Message Date
pawan
af111e9c43 [fix] #6195 2016-09-12 15:16:23 +05:30
Rohit Waghchaure
e1d59d6dde test cases and minor changes 2016-09-12 13:27:28 +05:30
Rohit Waghchaure
1d0e8ea9c6 minor changes 2016-09-12 13:27:27 +05:30
Rohit Waghchaure
3815ebff8a Added %billed in timesheet 2016-09-12 13:27:27 +05:30
Rohit Waghchaure
a6927e05ba set project wise timesheet data 2016-09-12 13:27:27 +05:30
Rohit Waghchaure
cc8644f86e [Timesheet] Field rearrange 2016-09-12 13:27:27 +05:30
Nabin Hait
a36a88b6de Remove Difference Account field from Stock Entry parent form 2016-09-12 13:15:59 +05:30
Rohit Waghchaure
60a05324ce POS changes and fixes 2016-09-12 13:11:10 +05:30
Nabin Hait
294664b24c Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
2016-09-12 13:03:14 +05:30
robert schouten
4fc70d962b add customer and supplier names to some reports 2016-09-12 15:23:51 +08:00
robert schouten
ea3b342dde fix display unclosed values for trial/balance/sheet 2016-09-12 14:37:58 +08:00
RobertSchouten
bd979ec1ed [fix] itemwise sales register add sales invoice to delivery note when update stock
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
2016-09-12 09:46:10 +08:00
Saurabh
b835fef8ac [enhancement] modify payment request to get payment url (#6097)
* [enhancement] modify payment request to get payment url

* redirect to payment url if payment initiated via shopping cart
2016-09-09 11:19:22 +05:30
Nabin Hait
0a0df2e433 fixed version conflict 2016-09-07 17:01:47 +05:30
Nabin Hait
23147ff881 Patch fixed 2016-09-07 16:59:55 +05:30
Nabin Hait
c16c0ca944 Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
[Fix] Item level taxes are not getting calculated in POS
2016-09-07 15:59:32 +05:30
Rohit Waghchaure
525900c5c1 [Fix] Item level taxes are not getting calculated in POS 2016-09-07 15:01:08 +05:30
Chude Osiegbu
fbf27b5031 Further corrections to Currency Exchange table 2016-09-07 03:06:08 +01:00
pawan
7b2bd20a09 [fix] #6254 2016-09-06 18:28:41 +05:30
Nabin Hait
b8b228ed14 Fixed version conflict 2016-09-06 17:56:32 +05:30
RobertSchouten
5ae21053bd fix for closing balance typo 2016-09-06 15:44:09 +08:00
Rohit Waghchaure
377c7acd53 [POS] Added offline_pos_name in print format 2016-09-05 17:59:01 +05:30
Nabin Hait
406f0a38de Fixed merge conflicts 2016-09-05 15:44:18 +05:30
Nabin Hait
8693b5c93a Minor fixes 2016-09-05 11:51:45 +05:30
pawan
bd9a275d5f [fix] #6254 2016-09-02 16:51:22 +05:30
Nabin Hait
15b26d8b1a Fixed merge conflicts 2016-09-02 14:29:57 +05:30
Nabin Hait
5a4ca64c4a Party name in Payment Entry and cheque print format 2016-09-02 14:20:01 +05:30
Nabin Hait
f8e374643c Merge pull request #6257 from nabinhait/letter_head_in_report
Default letter head in report printing based on selected company
2016-09-02 14:17:12 +05:30
Saurabh
ff910f4c72 [fixes] set filter for warehouse 2016-09-02 13:39:05 +05:30
Nabin Hait
13b37c6346 Default letter head in report printing based on selected company 2016-09-02 11:25:42 +05:30
Rushabh Mehta
b2f0920346 [minor] new global for query report filters 2016-09-01 17:53:42 +05:30
Nabin Hait
2490ea0b91 Fixed merge conflict 2016-09-01 12:29:31 +05:30
Rohit Waghchaure
774ce63b75 remove mode of payment, migrate mode of payment from v6 to v7 2016-08-31 21:21:41 +05:30
Rohit Waghchaure
879cb6ebee [POS] Fixed POS Sales Invoice when Payment Table is Empty 2016-08-31 14:41:48 +05:30
Nabin Hait
566759acae Merge pull request #6211 from rohitwaghchaure/v7.1_fixes
[Fix] Billing Hours showing blank on sales invoice
2016-08-31 12:12:48 +05:30
Rohit Waghchaure
a2bf16bfaa [Fix] Billing Hours showing blank on sales invoice 2016-08-29 13:37:13 +05:30
Nabin Hait
338e63c448 Fixed version conflict 2016-08-29 11:47:50 +05:30
Rohit Waghchaure
63bdd679d0 [POS] Fixes and cleanup 2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Nabin Hait
4403cf71b5 Merge pull request #6152 from rohitwaghchaure/profitability_report
[Report] Profitability Analysis
2016-08-26 13:21:01 +05:30
Rohit Waghchaure
0cb171feb2 [Enhancement] Added billing hours for account user in timesheet 2016-08-26 13:17:46 +05:30
Nabin Hait
e334813daf Merge pull request #6166 from neilLasrado/demo
Merged Schools Demo into ERPNext
2016-08-26 13:05:43 +05:30
Rohit Waghchaure
6462ba4e0b minor changes 2016-08-26 12:42:52 +05:30
Nabin Hait
0da75aede3 Fixed merge conflict 2016-08-26 12:40:02 +05:30
Nabin Hait
06b27757ab Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
[Sales Return] Minor fix in patch
2016-08-26 12:33:33 +05:30
Rohit Waghchaure
e21e1ebae2 [Sales Return] Minor fix in patch 2016-08-26 12:31:41 +05:30
Nabin Hait
0a99b4347b Party mandatory message 2016-08-26 12:30:45 +05:30
Nabin Hait
a26bb96d2d Merge pull request #6178 from nabinhait/status_updater_fix
Ignore validating billed amount against order if order item amount is zero
2016-08-26 12:09:39 +05:30
Nabin Hait
47a3f639ed Ignore validating billed amount against order if order item amount is zero 2016-08-26 11:39:39 +05:30
Neil Trini Lasrado
067245933e Fixed Demo 2016-08-25 18:31:42 +05:30