Commit Graph

18799 Commits

Author SHA1 Message Date
Makarand Bauskar
da15486624 Merge pull request #9260 from mbauskar/address-and-contacts
[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)
2017-06-13 17:08:56 +05:30
Makarand Bauskar
a7a7c835cc Merge pull request #9196 from msiddiq0/patch-2
Fix incorrect youtube link on Video Tutorials
2017-06-13 17:05:50 +05:30
Makarand Bauskar
f339f6d69f Merge pull request #9195 from msiddiq0/patch-1
Fixed wrong YouTube video link
2017-06-13 17:05:36 +05:30
Makarand Bauskar
65f5cf3fc1 Merge pull request #9197 from msiddiq0/patch-3
Fix incorrect YouTube link on Video Tutorials
2017-06-13 17:05:19 +05:30
mbauskar
96ce5821b8 [hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company) 2017-06-13 17:03:13 +05:30
Makarand Bauskar
0c5d732cd8 Merge pull request #9208 from mbauskar/docs
removed {next} from documentation and removed the globals from custom scripts
2017-06-13 16:32:26 +05:30
Makarand Bauskar
70ef313b0d Merge pull request #9245 from frappe-pr-bot/translations-2017-06-13
[translation] translation update
2017-06-13 16:23:22 +05:30
KanchanChauhan
1dc26b127b Salutation and Gender in Lead and Customer (#9199) 2017-06-13 15:26:35 +05:30
Saurabh
b7ef28d23d Merge branch 'hotfix' 2017-06-13 15:20:13 +05:30
Saurabh
797f2030f8 Merge branch 'master' into develop 2017-06-13 15:20:13 +05:30
Saurabh
0b35a3a67a bumped to version 8.0.48 2017-06-13 15:50:13 +06:00
frappe-pr-bot
f7fe66cc48 [translation] translation updates 2017-06-13 11:17:57 +02:00
Makarand Bauskar
8ce53c94d1 Merge pull request #9189 from mbauskar/mysql-lockout
[hotfix] fixes for mysql Lock wait timeout exceeded
2017-06-13 14:41:42 +05:30
mbauskar
6f71648719 [minor] removed the else condition in update_qty 2017-06-13 14:36:30 +05:30
mbauskar
f819c93329 [minor] replaced db_save by db_update and added patch to remove the indexes on tabBin 2017-06-13 13:22:34 +05:30
_JG_
aafe0c517f Update purchase_order_dashboard.py (#9149)
There are no links to projects
2017-06-13 13:00:47 +05:30
Makarand Bauskar
757e1bf846 Merge pull request #9213 from manassolanki/school-report
fix for student monthly attendance report
2017-06-13 12:30:37 +05:30
Ashwini Save
7f14f28099 Account Receivable - Credit Note column added to print format. (#9230)
* Account Receivable - Credit Note column added to print Format.

* Review changes for translation: Account Receivable add credit note column

* Review changes for translation: Account Receivable add credit note column

* Review changes for translation: Account Receivable add credit note column
2017-06-13 11:18:39 +05:30
Makarand Bauskar
88a0d22c10 Merge pull request #9214 from saurabh6790/stock_ledger_entry_indexing
[fix] add index on voucher type and voucher no in stock ledger entry
2017-06-12 17:26:24 +05:30
Nabin Hait
d0ac0bdc18 Merge branch 'master' into develop 2017-06-12 13:50:12 +05:30
Nabin Hait
d59df5dd5d Merge branch 'hotfix' 2017-06-12 13:50:11 +05:30
Nabin Hait
d3e1afa2f5 bumped to version 8.0.47 2017-06-12 14:20:11 +06:00
Makarand Bauskar
13239339a6 Merge pull request #9224 from rohitwaghchaure/pos_due_date_issue
[fix] Due Date cannot be before Posting Date during POS records syncing
2017-06-12 13:23:11 +05:30
Rohit Waghchaure
782d477be0 [fix] Due Date cannot be before Posting Date 2017-06-12 12:35:40 +05:30
Rushabh Mehta
4f8f9c1d9a [enhance] create demo with function bench --site sitename make-demo` (#9212) 2017-06-12 09:18:06 +05:30
rohitwaghchaure
f9fe5787a2 Merge pull request #9218 from rohitwaghchaure/pos_mobile_search
[minor] added mobile no to search customer in POS
2017-06-11 17:07:05 +05:30
Rohit Waghchaure
c8490626f9 [minor] added mobile no to search customer in POS 2017-06-10 12:21:37 +05:30
tunde
5127da952e changes expected payment_account in test case according to the fact that exchange rate should return latest saved rate 2017-06-09 17:11:41 +01:00
Saurabh
0c21d85f0d [fix] add index on voucher type and voucher no in stock ledger entry 2017-06-09 19:05:30 +05:30
tunde
7bf4b121f3 Merge branch 'hotfix' into issue_9180 2017-06-09 13:58:22 +01:00
Manas Solanki
4458eb356b fix for student monthly attendance report 2017-06-09 18:20:21 +05:30
mbauskar
828804fab0 [minor] removed the {next} from the last articles 2017-06-09 17:30:36 +05:30
mbauskar
11f0ee3cac [docs] removed the globals from documentation 2017-06-09 17:23:06 +05:30
Faris Ansari
0626716f48 Merge pull request #9182 from pratu16x7/stock-entry-detail-global-fix
[fix] sys_defaults global in stock entry detail
2017-06-09 16:27:07 +05:30
rohitwaghchaure
97fd21a01d [Fix] Accounts receivable summary report not loading data because credit note column was missing (#9191)
* [Fix] Accounts receivable summary report not loading data because credit note column was missing

* Create accounts_receivable_summary.py
2017-06-09 14:05:10 +05:30
Makarand Bauskar
665311b38a [hotfix] replaced __ call with _ in project_timesheets.html (#9198) 2017-06-09 14:03:20 +05:30
tunde
0a5db528b1 makes sure latest test fixtures for currency exchange is retrieved before running test 2017-06-09 08:14:10 +01:00
msiddiq0
a05c168808 Fix incorrect YouTube link on Video Tutorials
The original YouTube video is private and not viewable by anyone. I linked the publicly viewable YouTube video for "Report Builder" now.
2017-06-08 21:02:45 -04:00
msiddiq0
a095d6e04b Fixing youtube link
Wrong youtube video linked here: "Managing Advance Payments". Linked to correct video now: "Bulk Update"
2017-06-08 20:51:50 -04:00
msiddiq0
03183332b4 Fixed wrong YouTube video link
The original link here led to video on "Bulk Update" not "Budgeting". I went and found the Budgeting video and linked it here now.
2017-06-08 20:10:18 -04:00
tunde
9b827e5b95 makes set_exchange_rate retrieve the latest exchange rate not average for "pay" and "internal transfer" payment entries 2017-06-08 20:54:01 +01:00
tunde
6148fe0909 adds test case to confirm that latest exchange rate is automatically selected 2017-06-08 20:50:11 +01:00
tunde
88f1d316d8 adds new tests that verify that get_exchange_rate returns the latest exchange rate 2017-06-08 19:44:26 +01:00
tunde
3eb5cb14d1 calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate 2017-06-08 14:23:49 +01:00
mbauskar
1042941348 [hotfix] fixes for mysql Lock wait timeout exceeded 2017-06-08 18:45:50 +05:30
pratu16x7
adb418d453 [fix] sys_defaults global in stock entry detail 2017-06-08 10:42:03 +05:30
Nabin Hait
89f7dd3c98 Merge branch 'hotfix' 2017-06-08 10:34:45 +05:30
Nabin Hait
2c808c578d Merge branch 'master' into develop 2017-06-08 10:34:45 +05:30
Nabin Hait
72f7a1a748 bumped to version 8.0.46 2017-06-08 11:04:44 +06:00
Javier Wong
b414f73931 [enhancement] Allow on Submit for Sales Order Customer PO and Customer PO Date (#9137) 2017-06-07 20:11:45 +05:30