Faris Ansari
68dbf7f99c
fix: Use frappe.utils.make_event_emitter
2018-11-02 13:30:51 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop
2018-10-30 12:54:16 +00:00
Ameya Shenoy
6178b79555
Merge branch 'master' into staging-fixes
2018-10-30 12:48:45 +00:00
Faris Ansari
3df1327b94
fix: Delete button in POS mobile
...
Delete button was covered by page-actions container
2018-10-29 15:15:10 +05:30
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +00:00
Ameya Shenoy
ca66c7ba14
Merge branch 'master' into staging-fixes
2018-10-23 08:01:13 +00:00
Rohit Waghchaure
55416e08f1
[Fix] Marketplace setting permission error
2018-10-23 11:52:06 +05:30
Rohit Waghchaure
aef7a6ec44
[Fix] User able to edit the rate in offline POS even if it has no permissions
2018-10-22 13:51:32 +05:30
Ameya Shenoy
c1231d65fd
Merge branch 'staging' into develop
2018-10-19 13:27:07 +00:00
Saif
3c9155e406
[Minor Fix] Force toggle display Net Total field when default taxes are fetched ( #15532 )
...
* Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched
* Prevent net_rate from becoming NaN
* -Fixed problem that party_account_currency was not set in mapped document
-Fixed problem that discount amount was not recalculated (in mapped document)
-Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency
2018-10-18 17:57:56 +05:30
Ameya Shenoy
f5d3ce8846
Merge branch 'staging' into develop
2018-10-08 09:44:34 +00:00
Shreya Shah
4fb9230d16
Add missing method link_to_mrs to buying.js ( #15613 )
2018-10-08 14:18:03 +05:30
Shreya Shah
95d93913ce
fix(link_to_mr): Add missing method to buying.js ( #15616 )
2018-10-08 14:17:37 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
rohitwaghchaure
d6cacbe565
Merge pull request #15567 from rohitwaghchaure/fix_payment_request
...
[Fix] Payment request not working
2018-10-03 16:03:48 +05:30
Rohit Waghchaure
210f4984f7
[Fix] Payment request not working
2018-10-03 15:55:51 +05:30
Charles-Henri Decultot
efd776da46
Events in timeline ( #15485 )
...
* Events in timeline
* Namespace correction
* Codacy correction
* Addition of sales partners in participants
* Correct json indent
2018-10-03 10:41:26 +05:30
Faris Ansari
e0a148474d
fix: Translation string ( #15561 )
2018-10-03 10:37:41 +05:30
Rushabh Mehta
11e2119670
style(icon): revert to old icon
2018-10-02 11:06:55 +05:30
Saif
90cf2ddc01
Make pricing rule from Supplier and Customer Doc ( #15533 )
...
* Make pricing rule from Supplier and Customer Doc
* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +05:30
Faris Ansari
6575e52942
fix: Refactor Review Area according to new Text Editor ( #15536 )
...
- depends on https://github.com/frappe/frappe/pull/6159
2018-09-30 21:08:46 +05:30
Faris Ansari
7a8c5b0c2c
fix(setup wizard): Validate FY dates ( #15473 )
2018-09-25 18:34:33 +05:30
Zarrar
e83ff38c10
[Enhance] Deferred Expense ( #15437 )
...
* added section for deferred expense in item master
* added default expense account field in Company master
* added deferred expense section in purchase invoice item
* validation and getter code added
* scheduler event to book expense every month
* codacy, import fix and other minor fixes
* rectify debit credit logic for expense
* commonify js code for deferred expense and revenue
* remove deferred calculation and validation
* common file to calculate deferred revenue and expense
* codacy fixes
* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
Faris Ansari
aa856c474a
fix(setup wizard): Validate FY dates ( #15419 )
...
- start date should be less than end date
2018-09-18 10:42:04 +05:30
rohitwaghchaure
713cfc786f
[enhance] Payment order ( #15056 )
2018-09-11 17:40:37 +05:30
Faris Ansari
76b31deda5
Isomorphic marketplace ( #15384 )
...
* feat: Make marketplace run on hub server in Guest mode
* fix: Skip page actions on server
* fix: Limit PageContainer to marketplace route
* fix(eslint): Add hub variable to globals
2018-09-11 17:38:31 +05:30
Faris Ansari
9fb5e1c61b
fix(image): New Image component to consistently handle broken images
...
- psuedo element hack didn't work cross browser
2018-09-07 23:17:29 +05:30
Nabin Hait
b479a87031
fix(report): Cost center filters in financial statements and general ledger
2018-09-07 13:17:23 +05:30
Sanjay Kumar
1b49f3a4e7
Allow cost center in entry of balance sheet accounts ( #14972 )
...
* Allow Cost Center In Entry of Balance Sheet Account
* Add parent cost center in get payment entry
* Add Tests for Allow Cost Center In Entry of Balance Sheet Account
* Add tests for cost center wise account and party balance
* set parent cost center in taxes
* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents
* fix Codacy and Travis issue
2018-09-06 14:39:35 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year ( #15320 )
2018-09-05 17:18:59 +05:30
Prateeksha Singh
8a160684b7
[fix] filter() result in list
2018-09-04 10:59:20 +05:30
Faris Ansari
7be9c381d8
fix: Revert skeleton in Sidebar
...
- sidebar items repeating for some reason
2018-09-04 00:12:47 +05:30
Faris Ansari
66321e6af7
feat: Add skeleton to Home and Sidebar
2018-09-03 19:39:19 +05:30
Prateeksha Singh
1265a26c0c
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 18:50:25 +05:30
Prateeksha Singh
456c39336d
[hub] update settings after publish, fix route_map
2018-09-03 18:49:33 +05:30
Faris Ansari
2b80bbbe16
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 17:50:06 +05:30
Prateeksha Singh
6ba9b3f4de
[hub] hide Contact Seller and Save Item in read-only
2018-09-03 17:49:11 +05:30
Faris Ansari
b592a76016
fix: Selling Messages
2018-09-03 17:49:11 +05:30
Prateeksha Singh
ad6948844e
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 17:32:17 +05:30
Prateeksha Singh
b2eadfe31d
[hub] show become a seller button to all, but not dialog
2018-09-03 17:31:43 +05:30
Faris Ansari
d4bba297c2
fix: Container title
2018-09-03 17:12:22 +05:30
Faris Ansari
28652baacc
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e
fix: email in profile dialog
2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17
[fix] add message for admin users before register dialog
...
- use is_registered api for page routes
2018-09-03 16:39:59 +05:30
Faris Ansari
ad0be6aaa2
fix: Messages
...
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109
[marketplace] Disallow unregistered routes if not registered
2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85
[hub] ask company description in dialog
2018-09-03 13:11:23 +05:30
Prateeksha Singh
85563ddfd3
[hub] update publish hub api
2018-09-03 02:44:27 +05:30
Prateeksha Singh
5511e06f06
[hub][api] Update save and view api to be user specific
2018-09-03 02:25:41 +05:30
Faris Ansari
68129df74c
feat: Add add_user dialog and methods
...
- wip
2018-09-02 18:29:00 +05:30