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

15610 Commits

Author SHA1 Message Date
Prateeksha Singh
1e02f00075 [hub] record views, update favourite api 2018-08-28 17:24:31 +05:30
Faris Ansari
6df06cac97 fix: Show empty state if there are no items 2018-08-28 17:19:35 +05:30
Faris Ansari
c12f48da2d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 17:17:36 +05:30
Faris Ansari
811a2deb0f fix: Load and save base64 image in publish 2018-08-28 17:17:29 +05:30
Faris Ansari
5689494f9c chore: Remove old messages page 2018-08-28 16:52:17 +05:30
Saurabh
5b398f293a [fix] typo fix 2018-08-28 16:28:12 +05:30
Nabin Hait
a626d967c0 [fix] naming series refactor patch 2018-08-28 16:08:22 +05:30
Nabin Hait
24efd19895 [fix] naming series refactor patch 2018-08-28 15:47:08 +05:30
Nabin Hait
0e7a6856a7 [fix] naming series refactor patch 2018-08-28 15:44:46 +05:30
Saurabh
f2caacdf74 [fix] fix google map imports (#15240) 2018-08-28 15:23:35 +05:30
Nabin Hait
2d28eccdcf [fix] naming series refactor patch 2018-08-28 15:18:48 +05:30
Suraj Shetty
b92403fbed Add 'Become Seller' as a primary key 
- Also remove some unwanted code
 2018-08-28 15:04:33 +05:30
Suraj Shetty
f994e3ec6b Remove 'Become Seller' option from sidebar 2018-08-28 15:03:01 +05:30
Nabin Hait
2b9186da5a [fix] naming series patch 2018-08-28 15:02:59 +05:30
Nabin Hait
b2c94c0307 [fix] for python 3 2018-08-28 14:39:47 +05:30
Nabin Hait
04bca58fb7 [fix] missing functions related to google maps 2018-08-28 14:21:48 +05:30
Aditya Hase
e3ac5ff9e3 erpnext: refactor async to is_async (#15231) 2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c minor fix 2018-08-28 14:09:36 +05:30
Saurabh
79f3ea4094 [minor][fix] call update_percent_complete via validate (#15235) 2018-08-28 14:01:34 +05:30
Shreya Shah
e0a47aeb2f Improve performance for warehouse tree (#15207) 
* Fix conflicts

* Modify query structure

* Remove whitespaces
 2018-08-28 13:46:22 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Saurabh
1898e11585 patch sequence fix 2018-08-28 13:04:40 +05:30
Suraj Shetty
ec12b34a79 Add margin below publish area 2018-08-27 20:37:06 +05:30
Suraj Shetty
49c37d5a8e Add strip html filter 2018-08-27 20:31:29 +05:30
Faris Ansari
a4dcb6f548 fix: Add empty state in Selling 2018-08-27 19:57:12 +05:30
Faris Ansari
725603c0a9 feat: Selling Page 
- common Messages page for both buying and selling
 2018-08-27 19:51:36 +05:30
Saurabh
51570f731c [Fix] patch fixes for V11 migration 2018-08-27 17:00:51 +05:30
Prateeksha Singh
bc859cbf1d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-27 15:16:53 +05:30
Prateeksha Singh
872768d89f [hub] merge conflicts 2018-08-27 15:16:19 +05:30
Suraj Shetty
dc7e8e6a26 Replace hub_item_code -> hub_item_name 2018-08-27 14:11:48 +05:30
Zarrar
93577665f2 [Enhance] Multiselect for Cost Center and Project (#15208) 
* add filter for Cost Center, make CC & Project multiselect field

* update queries according to project/cost_center multiselect

* add multiselect filter for cost_center and project

* update query according to multiselect
 2018-08-27 12:08:53 +05:30
Maxwell Morais
a2c1d92374 Revert "Fix shipping_address for DropShipping" (#15218) 
* Revert "Cleaned up welcome email code (#15175)"

This reverts commit 771fbb8f01.

* Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)"

This reverts commit 2b72d09948.

* Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)"

This reverts commit c5cf428d00.

* Revert "[Minor] Create default department on country setup (#15206)"

This reverts commit 2b2712bb9e.

* Revert "Permissions issue in BOM tree"

This reverts commit 8fe8d1758a.

* Revert "Fix indentation accounts_receivable.py (#15203)"

This reverts commit fbc3df3247.

* Revert "Fix shipping_address for DropShipping (#15202)"

This reverts commit 4a394bcbf4.
 2018-08-27 12:05:41 +05:30
Ahmed Madi
1516b8d54a Update asset_category.js (#15222) 2018-08-27 12:04:12 +05:30
Zarrar
b94c7075d8 rectify item price route (#15223) 2018-08-27 11:44:13 +05:30
rohitwaghchaure
e33047250e [Fix] Speacial character issue in searching project in sales invoice (#15220) 2018-08-27 11:43:57 +05:30
Prateeksha Singh
fa26899cd0 [hub] added DetailHeaderItem to detail pages, contact seller button 2018-08-27 10:49:42 +05:30
Prateeksha Singh
d0a952bcda [hub] Register components, init Item Page 
- commonly used components are pre-registered
- add DetailHeaderItem component
- begin ItemPage
 2018-08-27 10:12:45 +05:30
Faris Ansari
f089dad7c7 feat: Sidebar in vue 2018-08-26 22:20:16 +05:30
Faris Ansari
d37108d18e fix: Add back link to Buying 2018-08-26 22:19:56 +05:30
Faris Ansari
23e45ada69 chore: Remove old messages files 2018-08-26 22:19:29 +05:30
Faris Ansari
ea82fb9f80 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 20:09:12 +05:30
Faris Ansari
caebd4a9b9 feat: Buying and BuyingMessages in vue 2018-08-26 20:09:02 +05:30
Faris Ansari
019bfd3940 feat: Add helper directives 
- v-route
  automatically route to a valid frappe route
- v-img-src
  handle img loading and error handling
 2018-08-26 20:08:40 +05:30
Faris Ansari
bf5cc7d823 feat: SectionHeader component 2018-08-26 20:00:42 +05:30
Faris Ansari
4a2ea993fd fix(search-input): submit on enter 2018-08-26 19:49:20 +05:30
Faris Ansari
fad623eb27 feat: Add dynamic routes in PageContainer 2018-08-26 19:48:52 +05:30
Prateeksha Singh
fad0f64c94 [hub][vue] add action object in empty state, make NotFound page 2018-08-26 18:27:04 +05:30
Prateeksha Singh
5c9b13f5e5 [hub][vue] add skeleton state to DetailView 2018-08-26 18:06:25 +05:30
Prateeksha Singh
9e8d7bbeda [hub][vue] Seller Page 2018-08-26 16:29:32 +05:30
Prateeksha Singh
80a8dfd6ba Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 13:09:52 +05:30
Prateeksha Singh
5e30beec86 [hub][vue] DetailView and Profile page 2018-08-26 13:09:19 +05:30
Faris Ansari
888dd606ff feat: Add PageContainer 2018-08-26 12:41:02 +05:30
Suraj Shetty
0e59ec3ed2 Update messages UI 2018-08-26 10:07:00 +05:30
Suraj Shetty
88700cf2b9 Separate links for selling and buying messages 
- Add separate UI for selling messages
- Remove some redundant code messages
 2018-08-26 10:06:27 +05:30
Prateeksha Singh
de426cb543 [hub][vue] Home page, add section title in item key in v-for 2018-08-25 21:54:49 +05:30
Prateeksha Singh
53fada1ae9 [hub][vue] search page 2018-08-25 20:31:48 +05:30
Prateeksha Singh
0be2859f5b [hub][vue] Category and Published Products pages 2018-08-25 15:54:43 +05:30
Prateeksha Singh
c31e5c0013 [hub][vue] replace page files, fix item 'seen' prop 2018-08-25 14:09:01 +05:30
Prateeksha Singh
00175eab8e [hub][vue] Saved Products Page, remote item card 
- also undo unfavouriting items
 2018-08-25 13:18:30 +05:30
Prateeksha Singh
fe41713974 [hub][vue] add import 2018-08-24 16:53:34 +05:30
Prateeksha Singh
40f7c4663a [hub][vue] Publish Page 2018-08-24 16:38:34 +05:30
Neil Trini Lasrado
771fbb8f01 Cleaned up welcome email code (#15175) 2018-08-24 15:15:56 +05:30
rohitwaghchaure
2b72d09948 [Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187) 2018-08-24 11:28:34 +05:30
rohitwaghchaure
c5cf428d00 [Enhance] Provision to backflush raw materials from WIP warehouse (#15184) 2018-08-24 11:27:41 +05:30
Zarrar
2b2712bb9e [Minor] Create default department on country setup (#15206) 
* make default department when creating new company

* remove departments and tds entry for the company
 2018-08-24 11:26:51 +05:30
Prateeksha Singh
67e0374261 [hub] add data-driven notification message 2018-08-23 23:55:04 +05:30
Prateeksha Singh
b696b2965d [hub][vue] add empty state and dynamic publish button 2018-08-23 21:25:53 +05:30
Nabin Hait
8fe8d1758a Permissions issue in BOM tree 2018-08-23 16:25:51 +05:30
Prateeksha Singh
d7d2bb261b [hub] add SearchInput 2018-08-23 13:52:41 +05:30
Prateeksha Singh
6e5b9a8f9b Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-23 12:23:09 +05:30
Prateeksha Singh
ff616b8845 [hub][vue] init item card container in vue 2018-08-23 12:22:20 +05:30
Mario Monroy
fbc3df3247 Fix indentation accounts_receivable.py (#15203) 2018-08-23 11:10:15 +05:30
Faris Ansari
c4e38ffd4d Remove hub page (#15195) 2018-08-23 11:09:31 +05:30
Maxwell Morais
4a394bcbf4 Fix shipping_address for DropShipping (#15202) 
This stretch of javascript go against the address definition for DropShipping.
When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address.

To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.
 2018-08-23 11:08:37 +05:30
Charles-Henri Decultot
25712f8d65 Sales order correction (#15190) 2018-08-23 10:51:44 +05:30
Benji
363dd2773e Update email_digest.py (#15144) 2018-08-22 21:57:51 +05:30
Suraj Shetty
341386e3a7 Add list view for messages 2018-08-22 21:31:16 +05:30
Suraj Shetty
d94701e5cc Add recent message block to item_card 2018-08-22 16:47:50 +05:30
Suraj Shetty
b361c234b1 Remove unused message to avoid confusion 2018-08-22 16:44:55 +05:30
Valmik
6ad16db88c check for existing task before appending to child table (#15183) 2018-08-22 14:46:33 +05:30
Shreya Shah
be7703387d Fetch reserved qty (#15182) 
* Fetch reserved qty

* Update get_item_details.py
 2018-08-22 14:45:22 +05:30
Faris Ansari
427a1301b7 Issues on the Portal should be editable (#15181) 2018-08-22 14:43:32 +05:30
Suraj Shetty
7ee79498fc Hide review option for unregistered user 2018-08-22 12:09:40 +05:30
Suraj Shetty
831ff42101 Stop event bubbling on clicking edit item 2018-08-22 11:52:20 +05:30
Suraj Shetty
12de0aec11 Fix publish button alignment 2018-08-22 11:50:23 +05:30
Suraj Shetty
fc7b7b6b97 Allow item list for System Manager 2018-08-22 11:32:49 +05:30
Suraj Shetty
7a040c4dd8 Show favorite button only for registered user 2018-08-22 11:32:49 +05:30
Suraj Shetty
f9e4cca334 Throw error if hub_url is not present in site_config 2018-08-22 11:32:49 +05:30
Suraj Shetty
3cd0c54438 Fix pyhton 3 compatibility 2018-08-22 11:32:49 +05:30
Prateeksha Singh
631c170ccf [hub] fix merge conflicts 2018-08-21 21:00:53 +05:30
Prateeksha Singh
caadd8af4e [Hub] sync with insert_many, Remove Data Migration Run 💥 
- Use FrappeClient insert_many to publish items
- We will be syncing small amounts of items anyway
- Also, we need only the insert action in bulk
 2018-08-21 19:59:15 +05:30
Faris Ansari
e745e85d98 feat: route to message room page after contact seller dialog 2018-08-21 19:48:42 +05:30
Faris Ansari
e7af44f1a6 fix: remove items with invalid image 2018-08-21 19:48:06 +05:30
Faris Ansari
a22aa60a17 Merge with upstream 2018-08-21 19:17:25 +05:30
Faris Ansari
ff189b6853 fix: publish items 
- Pass image data as a json
- ignore duplicates while creating Hub Tracked Item
 2018-08-21 19:14:44 +05:30
Faris Ansari
d29a3b3567 Highlight links with part route or full route 2018-08-21 19:12:10 +05:30
Zlash65
4d462d637f indentation fix 2018-08-21 18:19:26 +05:30
Rushabh Mehta
9a29bfa49e fix(indentation): sales_and_purchase_return.py 2018-08-21 17:53:25 +05:30
Prateeksha Singh
b0a3a106fc [hub] profile email uneditable, style additions, base64 sync enable 2018-08-21 17:43:30 +05:30
Faris Ansari
d17aedb719 Add BuyingMessages page 2018-08-20 18:33:46 +05:30
Bassam Ramadan
1ff2315899 Trial balance and payable accounts reports and sales return fixes (#15000) 
* adding supplier type filter to payable accounts and payable accounts summary reports

adding supplier type filter to payable accounts and payable accounts
summary reports as customer group at receivable accounts and summary
reports as its important and easier to put this filter

* fix trial balance opening and closing values

the removed mathematical operations was causing showing incorrect values
at opening and closing columns where the total row was correct so the
operation deleted to view the correct values to be equal to the total
row and to stop confusing the user due to different values between the
total row and the the values in front of each account

* fix for supplier type filter field on payable accounts reports

rename the supplier type filter field to supplier group in payable
accounts and summary reports

* fix for paid amount in returned sales invoice

the current paid amount not change from source value if you deleted any
item if the invoice contain for example 3 items and you only need to
return on item the current steps is to open the original invoice and
press on make return then you delete the unwanted items but in this case
the paid amount will not change and you will get an alert from the
system until you change it manually but with this modification it works
very well.

* fixing trial balance values and totals

fixing trial balance opening and closing ( DR - CR ) values and totals
 2018-08-20 17:58:28 +05:30
Saif
15636a3b98 Problem: Making a PE from PO led to incorrect values in PE form since PO's default party_account_currency is the company's currency (#15153) 
Fix: PO will set party_account_currency to supplier's default currency on validation.
 2018-08-20 17:57:00 +05:30
Saif
a09a8c3bf7 Fixed missing DocType info for Purchase Items (#15152) 
* Made Purchase Invoice Items' Batch No and Serial No fields non copyable.

* Added appropriate currency field options to Purchase...Items DocFields:
-Landed Cost Voucher Amount
-Billed Amt
 2018-08-20 17:55:18 +05:30
rohitwaghchaure
8cca61f1ba [Fix] Removed roles for Eway bill report (#15157) 2018-08-20 17:53:56 +05:30
rohitwaghchaure
b800382abf [Fix] Due to incorrect conversion factor user not able to make purchase return entry (#15163) 2018-08-20 17:50:31 +05:30
rohitwaghchaure
e689a903d8 Allowed data import for Assessment Result (#15168) 2018-08-20 17:50:04 +05:30
Saif
e3947296e8 Group by Voucher fix in General Ledger Report (#15169) 
* -Group by Voucher requires ordering the query not grouping the query
-Summing fields is not necessary since grouping by 'name' is the same as getting individual entries

* Group by Voucher show groups with totals at the end of group
 2018-08-20 17:49:29 +05:30
Benji
299185fe24 Improved task weight calc (#15170) 
* Improved task weight calc

Removed the requirement to have total of task weights to be exactly 1.

* Update project.py
 2018-08-20 17:41:56 +05:30
rohitwaghchaure
ecc6af9d2a [Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171) 2018-08-20 17:39:54 +05:30
Nabin Hait
c95153f83b Offer date mandatory in job offer 2018-08-20 16:58:06 +05:30
Faris Ansari
8de6380648 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 15:58:58 +05:30
Prateeksha Singh
71b41b4771 [hub] response data in hub call event trigger 2018-08-20 15:42:48 +05:30
Prateeksha Singh
e72a2fa9de [hub] emit hub call event to set category options while publishing 2018-08-20 14:18:07 +05:30
Prateeksha Singh
6faffa5007 [feat] new component: ItemPublishDialog 2018-08-20 14:02:33 +05:30
Prateeksha Singh
4ce54b0011 [feat] new component: NotificationMessage 2018-08-20 13:07:23 +05:30
Zarrar
2b0ecbed2b python3 based fix for sorted (#15159) 2018-08-20 11:15:06 +05:30
Prateeksha Singh
42be665412 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 10:08:49 +05:30
Prateeksha Singh
96fdbd467d [hub][feat] stateful publishing area 2018-08-20 10:07:56 +05:30
Prateeksha Singh
fe67508d60 [hub][feat] Edit your Profile, recycle profile dialog 2018-08-20 01:18:41 +05:30
Prateeksha Singh
305f7375d1 [hub] Register in a dialog instead of Page 
- in order to recycle it for Edit Profile
- Also, the register page had too much custom code
 2018-08-20 00:25:26 +05:30
Prateeksha Singh
a525d12f69 [hub] sync multiple image urls 
- using a simple multiselect currently
 2018-08-19 22:31:33 +05:30
Prateeksha Singh
0a60d1cd96 [hub] Publishing Dialog, Sync category 
- Hub Category selection
- Recycled
 2018-08-19 19:39:00 +05:30
Faris Ansari
2ce2e1b6b0 feat(messages): split messages into buying and selling 
- messages will be organized by their purpose, i.e Buying and Selling
- on clicking the buying item, the message room page will be opened
where sellers can communicate
- invalidate cache using event key
 2018-08-17 18:39:36 +05:30
Faris Ansari
335c0f200f feat: custom cache invalidation for hub calls 
In some cases, we know when to invalidate the cache.
This feature allows to do just that.
erpnext.hub namespace is now an EventEmitter instance.
 2018-08-17 16:04:14 +05:30
Faris Ansari
c1fe1c45c7 feat: empty states for favourites and search page 2018-08-17 14:29:42 +05:30
Faris Ansari
aa46567439 refactor: rename hub-card-container to hub-items-container 2018-08-17 14:29:22 +05:30
Rushabh Mehta
5f33b69f2f fixes(minor): clean item group html and hide image 2018-08-16 14:48:02 +05:30
Nabin Hait
9409eddf28
Update __init__.py 2018-08-16 13:58:44 +05:30
rohitwaghchaure
5c5688b374 Added provision to disabled in stock in products settings (#15133) 2018-08-16 10:33:28 +05:30
Charles-Henri Decultot
bd06a5b0ee Small python 3 compatibility correction (#15151) 2018-08-16 10:32:49 +05:30
Shreya Shah
80f30094fb Fix error msg (#15146) 2018-08-16 10:29:16 +05:30
rohitwaghchaure
6fb2117767 Allow to make budget for the same cost center with different account (#15149) 2018-08-16 10:22:06 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
rohitwaghchaure
7e36aa4162
Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report 
[Fix] Consolidated balance sheet report
 2018-08-15 19:41:41 +05:30
Rohit Waghchaure
cafd61de85 [Fix] Consolidated balance sheet report 2018-08-15 16:18:46 +05:30
Zarrar
3523b779aa rounding off fixes and conversion fix (#15140) 2018-08-14 16:28:14 +05:30
Ameya Shenoy
338dfcfb63 monkey patching for demo (#15141) 2018-08-14 16:27:47 +05:30
Prateeksha Singh
460e2798cd [hub] Favourites UI 
- remove from listing
- add to favourites
 2018-08-14 11:42:40 +05:30
Faris Ansari
4809f86035 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) 2018-08-14 10:56:18 +05:30
Shreya Shah
0631aed3d9 Discount amount field in all transactions' child tables (#15124) 
* Add discount_amount and base_discount_amount in Sales Invoice Item

* Add patch for existing documents

* Discount amount field in all child tables of Purchase and Selling

* Remove console statements
 2018-08-14 10:51:48 +05:30
rohitwaghchaure
88b0a1305f Code optimization for accounts receivable report to avoid timeout error (#15114) 
* Code optimization for accounts receivable report to avoid timeout error

* Added index for party_type
 2018-08-14 10:51:13 +05:30
Prateeksha Singh
1a0fb5b63a Add detail page favourited state 2018-08-14 01:31:03 +05:30
Prateeksha Singh
c5a9972785 [refactor][major] Separate out Components 
- item_card
- item_card_container
- detail_view
- search_bar
- reviews
- skeleton_state
- empty_state
- empty_state
 2018-08-13 21:36:07 +05:30
Nabin Hait
3b5f18231a fix(item_defaults): Item name was overwriting by child name 2018-08-13 17:45:29 +05:30
Saurabh
ddbf3aaccb Merge branch 'master' into develop 2018-08-13 13:15:58 +05:30
Saurabh
cd6b955b99 bumped to version 10.1.48 2018-08-13 13:45:56 +06:00
Rohit Waghchaure
18960c7757 Project task custom field not copying and error on project 2018-08-13 11:40:11 +05:30
Zarrar
a4d06fc881
replace cur_frm with frm 2018-08-12 17:48:04 +05:30
ahmad zaqout
7df03a4b5b
replace department group to department 2018-08-11 22:10:24 +03:00
ahmad zaqout
0fd562e0d9
replace customer to department 2018-08-11 21:54:56 +03:00