Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,265 Commits 3 Branches 0 Tags 1 GiB
d885248309
Commit Graph

23265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prateeksha Singh
d885248309 [hub] remove sync_in _progress set 2018-07-26 18:21:33 +05:30
Prateeksha Singh
bcd7077342 [hub] remove sync_in_progress set 2018-07-26 18:20:58 +05:30
Prateeksha Singh
d450c0ac08 [hub][publish] in_progress/empty state 2018-07-26 17:24:33 +05:30
Prateeksha Singh
b750425288 [hub] sync in progress 2018-07-26 16:25:22 +05:30
Prateeksha Singh
d1224ca662 [hub][init] add profile page 2018-07-26 13:39:06 +05:30
Prateeksha Singh
f26177bdbc [hub] setup publish items flow 2018-07-26 10:38:11 +05:30
Prateeksha Singh
1d1696080e [hub][publish] add search, fix multiple append 2018-07-26 08:36:33 +05:30
Prateeksha Singh
505f6f14e9 [hub][publish] select/deselect all items 2018-07-26 08:06:21 +05:30
Prateeksha Singh
9685d7c37a [hub] registered vs read-only views 2018-07-26 01:12:00 +05:30
Prateeksha Singh
cf2d2a5c75 [hub][init] add publish items page 2018-07-25 20:02:12 +05:30
Prateeksha Singh
bc8caefc19 [hub] add register as a seller page 2018-07-25 11:08:23 +05:30
Faris Ansari
0fbaa72504 Add review area 2018-07-25 00:49:11 +05:30
Faris Ansari
ea2d1b0a19 New page: marketplace 
- subpages: home, favourites, item, category
 2018-07-23 18:44:46 +05:30
Faris Ansari
f585197045 Cleanup homepage 2018-07-23 11:55:07 +05:30
Rushabh Mehta
ce6e27a066 [minor] frappe 2018-07-19 17:47:04 +05:30
KanchanChauhan
0c3d345a9f [Minor] Moved mandatory Company field from More Information section to top (#14950) 2018-07-19 14:39:31 +05:30
Ranjith Kurungadam
dff2ba72d3 test TDS calculation (#14919) 
* test TDS calculation

* fix failing test cases

* fix codacy
 2018-07-19 14:34:05 +05:30
Saurabh
a8e24cba46 Merge patch and delete fields from subscription (#14941) 
* Delete subscription records after migrating all records to auto-repeat

* delete old fields from subscription
 2018-07-19 14:33:31 +05:30
Saurabh
139d165258
Merge pull request #14962 from saurabh6790/staging_version_1 
Update staging version to support semantic versioning
 2018-07-19 13:38:34 +05:30
Saurabh
dfdad651ea Update staging version to support symentic versioning 2018-07-19 13:36:32 +05:30
Nabin Hait
9c5afc3620 website permission for support portal 2018-07-19 13:02:36 +05:30
Nabin Hait
47ce481394 Minor fix 2018-07-19 11:10:46 +05:30
Prateeksha Singh
627d0d58be
[fiscal-year] use to_date property 2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707 [fix] format fiscal year docname to proper date before using 🤦 (#14955) 2018-07-18 18:03:27 +05:30
Saurabh
d9d8dda5da
Merge pull request #14954 from saurabh6790/conflict_fixes 
[minor] remove conflicts
 2018-07-18 17:21:54 +05:30
Saurabh
0bfbf8aa6f [minor] remove conflicts 2018-07-18 17:21:07 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Saurabh
8ca5940f76 Merge branch 'hotfix' 2018-07-18 16:24:54 +05:30
Saurabh
6c46b4edc4 bumped to version 10.1.43 2018-07-18 16:54:54 +06:00
Shreya Shah
8395a7ad6f Modifications in last purchase rate button (#14948) 
* Make last purchase rate button visible until submitted

* Move buttons

- Get last purchase rate and link to material request buttons moved to toolbar under Tools button

* Remove disable fetch last rate functionality

* Make last purchase rate field read_only
 2018-07-18 12:27:27 +05:30
Shreya Shah
9baa3bef8b [Portal] Display issues raised by all users of a customer (#14947) 
* Display issues raised by all users of a customer

* Fixed as per review
 2018-07-18 12:25:38 +05:30
Faris Ansari
9e874af9ba Query report print (#14935) 
* QueryReport

- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns

* Query Report

- Replace frappe.query_report_filters_by_name with new API
 2018-07-18 09:28:44 +05:30
Rushabh Mehta
69fa808def [minor] fixes + patch (#14937) 2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832 Defaults in Item Group (#14874) 
* Add Defaults table in Item Group

* Fetch defaults from Item group if not found in Item

* Add patch

* Remove default fields from Item Group

* Set query for defaults

* Fix Codacy

* Modify test records

* Modify budget.py and sales_order.py

* Remove join from query

* Else condition to avoid error if no defaults found

* refrain from making item test records before item_group

* default cost center fetch correction

* Remove tab item group from query
 2018-07-17 18:01:44 +05:30
rohitwaghchaure
6863b03790 Naming series increase even if there is an exception while saving the invoice from the backend (#14938) 2018-07-17 17:20:15 +05:30
rohitwaghchaure
a76067eea1 [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899) 
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order

* Added test cases
 2018-07-17 16:50:50 +05:30
Saurabh
af479c8192 set valid delivery date (#14890) 
* set valid delivery date

* calculate delivery date based on diffrence in transation date and delivery date of ref doc
 2018-07-17 16:49:32 +05:30
rohitwaghchaure
216f9373c9 Provision to select the cost center in the asset (#14934) 2018-07-17 16:47:51 +05:30
Shreya Shah
663b435919 Update modified time to fix patch (#14931) 2018-07-17 16:47:18 +05:30
Saurabh
e78a877202 patch fixes (#14936) 2018-07-17 16:38:11 +05:30
Nabin Hait
1e693fe6c9 Replaced spaces with tabs 2018-07-17 16:08:39 +05:30
Nabin Hait
26786bd35d minor route fix for general ledger 2018-07-17 15:59:15 +05:30
rohitwaghchaure
5fe88ea93e [Fix] Not able to update the current value of the prefixes which are defined in the autoname field (#14918) 2018-07-17 12:45:25 +05:30
Shreya Shah
fbeab5bf73 Show opening balance of leaves (#14925) 
* Show opening balance of leaves

* Update employee_leave_balance.py
 2018-07-17 11:59:51 +05:30
Ameya Shenoy
8ba1310915 [fix] Location test (#14921) 2018-07-17 11:57:49 +05:30
Zarrar
fc0a5833a5 run set query if doctype exist (#14929) 2018-07-17 11:57:06 +05:30
Faris Ansari
107dbcdff8
Merge pull request #14917 from frappe/surajshetty3416-patch-1 
Fix typo
 2018-07-16 18:42:34 +05:30
Suraj Shetty
a6f984366a
Fix typo 2018-07-16 18:39:01 +05:30
Zarrar
26c9b94cc6 [ Improv ] Loyalty Program more fixes and test case (#14888) 
* remove console statements

* set account & cost center for redemption

* add test case for single/multi tier & is_return scenario

* reset tier when changing loyalty program

* make loyalty fields non copy type

* fix test case - delete si after every test to avoid interference
 2018-07-16 18:11:53 +05:30
rohitwaghchaure
a3e070bc6b [Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914) 2018-07-16 18:11:19 +05:30