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

45370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raffael Meyer
b91bb17779
refactor: get default contact or address (#35248) 
* refactor: get_party_shipping_address

* refactor: get_default_contact

* chore: adding docstrings

* fix: keep original order

* fix: use get_all instead of get_list

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-06-08 19:49:09 +05:30
ruthra kumar
9cd982aa54
Merge pull request #35610 from ruthra-kumar/fix_travis 
chore: fix travis
 2023-06-08 15:53:50 +05:30
ruthra kumar
992d61bd90 chore: fix travis 2023-06-08 15:11:46 +05:30
Didiman1998
0c12d4d3c5
fix: remove code that causes upscrolling (#35140) 
Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
 2023-06-07 22:35:44 +05:30
Trusted Computer
781548e46e
Fix: CSS not applied to product title (#35582) 
In an erpnext website, the /all-products route shows website items that have been published to the web site.

In the list view (erpnext/e_commerce/product_ui/list.js), the css class is null for the product title. Instead, inline style statements have been added in that can not be modified by overriding CSS.

This fix uses a similar approach to that which is taken in the grid view (erpnext/e_commerce/product_ui/grid.js). It removes the null CSS parameter in the product title link as well as the inline style statement. Then, as in the grid view, the product title is wrapped in a div tag with the product_title CSS class.

This makes it possible to style the product title as desired with a CSS override.

Closes #35580
 2023-06-07 22:11:49 +05:30
Deepesh Garg
f732cac678
fix: Project in item-wise sales register (#35596) 2023-06-07 22:06:05 +05:30
Raffael Meyer
0dde4d4c69
refactor: use delete_contact_and_address (#34497) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-07 22:02:38 +05:30
Dirk van der Laarse
3b409af9a0
fix: exclude disabled customers when fetching customers on process statement of accounts (#35539) 
fix: exclude disabled when fetching customers
 2023-06-07 22:01:44 +05:30
Raffael Meyer
e9d7b9f0f4
fix: column formatting in Bank Reconciliation Tool (#35540) 
* fix(Bank Reconciliation): format Date column

* fix(Bank Reconciliation): format Party column

* fix(Bank Reconciliation): actions button

- wrong closing tag
- explicitly quote data-name

* fix(Bank Reco): format date and link in dialog
 2023-06-07 21:51:49 +05:30
Raffael Meyer
e1f3b7cbc8
fix: pass translated label to change button type (#35564) 
fix: change button type for translated labels

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-06-07 21:49:02 +05:30
HarryPaulo
a9a47a51e4
fix: based on status_update.py update opportunity status to converted… (#35145) 
fix: based on status_update.py update opportunity status to converted on sales submit
 2023-06-07 21:35:52 +05:30
Deepesh Garg
0108b1abe2
fix: Improve validation message (#35489) 
* fix: Improve validation message

* Update erpnext/selling/doctype/customer/customer.py

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-06-07 21:33:36 +05:30
Ankush Menat
0166f69b31 chore: extend default role profiles 2023-06-07 15:09:49 +05:30
rohitwaghchaure
930a107af8
Merge pull request #35567 from s-aga-r/FIX-SBB-STATUS 
fix(ux): serial and batch bundle status
 2023-06-07 14:49:43 +05:30
Ankush Menat
4507cb3cd7
fix: enqueue_after_commit wherever it makes sense (#35588) 2023-06-07 11:58:36 +05:30
Deepesh Garg
76197cc437
chore: Default role profiles (#35584) 2023-06-07 10:11:32 +05:30
Deepesh Garg
2ffcca6f10
fix: Interest Accrual on Loan Topup (#35555) 
* fix: Interest Accrual on Loan Topup

* chore: CI

* chore: Ignore test
 2023-06-07 10:06:13 +05:30
Nabin Hait
1cf1c7943f
Merge pull request #35572 from nabinhait/quotation-fix 
feat: ability to create quotation against a prospect
 2023-06-06 21:54:24 +05:30
Sagar Sharma
a14a08dcb4
Merge pull request #35569 from s-aga-r/FIX-SO-SR-TEST 
fix(test): `test_stock_reservation_against_sales_order`
 2023-06-06 16:13:22 +05:30
Nabin Hait
5a0aacc0b6 fix: get party details 2023-06-06 15:39:22 +05:30
Nabin Hait
47ce6de57d feat: ability to create quotation against a prospect 2023-06-06 15:19:04 +05:30
s-aga-r
8fe1904f3f fix(test): test_stock_reservation_against_sales_order 2023-06-06 14:59:17 +05:30
s-aga-r
d6208d2e45 fix(ux): serial and batch bundle status 2023-06-06 12:07:46 +05:30
rohitwaghchaure
9e650a004a
Merge pull request #35562 from rohitwaghchaure/fixed-validation-for-stock-entry 
fix: added validation for insufficient stock during stock transfer
 2023-06-05 19:42:03 +05:30
Rohit Waghchaure
dcb0462d51 fix: added validation for insufficient stock during stock transfer 2023-06-05 16:58:54 +05:30
Smit Vora
b1ef19a0cd
fix(regional): allow regional override for updating gl_dict (#35550) 2023-06-05 01:43:26 +05:30
rohitwaghchaure
64f767b95d
Merge pull request #35552 from rohitwaghchaure/fixed-serial-batch-get-query 
fix: get_query for batch number and incorrect batch qty
 2023-06-04 16:56:46 +05:30
Rohit Waghchaure
acd12c5830 fix: get_query for batch number and incorrect batch qty 2023-06-04 16:09:01 +05:30
Sagar Sharma
5ebf46a1b5
Merge pull request #35510 from s-aga-r/FIX-ISS-23-24-01141 
fix: ignore `Non-Stock Item` while calculating `% Picked` in Sales Order
 2023-06-03 11:18:05 +05:30
rohitwaghchaure
14292ffc6f
Merge pull request #34564 from rohitwaghchaure/serial-no-normalization 
Feat: Serial No Normalization and Serial Batch Bundle
 2023-06-02 18:13:02 +05:30
Deepesh Garg
abc6fe0b06
refactor!: Remove custom cashflow report mapper (#35523) 
* refactor: Remove custom cashflow mapper

* chore: patch to delete docs

* fix: Cleanup defaults during install

* fix: Remove custom cashflow mapper from consolidated financial statement
 2023-06-02 17:48:59 +05:30
Rohit Waghchaure
bb95451db6 feat: added jinja method get_serial_or_batch_nos for print format and new print format 'Purchase Receipt Serial and Batch Bundle Print for reference 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
40ab3bdd35 test: test cases for serial and batch bundle 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
42b229435c fix: stock reco test case for serial and batch bundle 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f4cfc589c6 fix: serial and batch selector 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
39da92929b fix: serial and batch selector 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
26b39ac7f4 fix: travis for asset capitalization and asset repair 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
e88c5d6d90 fix: travis for subcontracting module 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f79f2a3bab fix: dialog issue 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
74ab20f97a fix: travis for POS merge invoice and putaway rule 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f8bf4aa7c8 fix: travis for work order, pos invoice and landed cost voucher 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
48fbf99e6d fix: travis for sales and purchase invoice 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
d3ceb07936 fix: travis 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
f704eb7581 fix: average batch wise valuation 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
854b89f252 fix: batch valuation for old entries 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
c2d7461d3c fix: travis issue 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
7290dd87be fix: linters and travis 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
9b72845f0f feat: serial and batch bundle for pick list 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
648efca940 feat: auto create serial and batch bundle 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
c1132d1e6d fix: serial and batch selector and added deprecated decorator 2023-06-02 17:14:16 +05:30