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

2265 Commits

Author SHA1 Message Date
Deepesh Garg
1894dc8197 fix: Test case and code cleanup 2023-06-23 21:53:34 +05:30
Deepesh Garg
da6bc1a13e refactor: Redo workflows 2023-06-23 20:57:51 +05:30
Deepesh Garg
6d121ae6e4 chore: fix typo 2023-06-22 13:03:09 +05:30
Deepesh Garg
3aead05f42 fix: Test related errors 2023-06-22 11:41:43 +05:30
Deepesh Garg
b64ebc6fcc test: fix payment reco tests 2023-06-21 17:49:45 +05:30
Deepesh Garg
92f845c0e1 chore: Advance fetching order 2023-06-21 12:21:19 +05:30
Deepesh Garg
016ed951da test: Update tests 2023-06-20 13:22:32 +05:30
Deepesh Garg
7ec9d76545 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-19 09:48:01 +05:30
rohitwaghchaure
86612b6c05
Merge pull request #35747 from rohitwaghchaure/fixed-incorrect-stock-value-for-pr-return 
fix: incorrect stock value for purchase returned with rejected qty
 2023-06-16 23:08:17 +05:30
Rohit Waghchaure
28dd758aa3 fix: incorrect stock value for purchase returned with rejected qty 2023-06-16 16:44:56 +05:30
Gursheen Anand
442e3f2aa2 fix: update outstanding amount and unpaid status on cancellation of payment entry 2023-06-16 13:38:47 +05:30
mergify[bot]
50f83859db
fix: consider field precision while setting sle actual_qty (backport #35717) (#35720) 
* fix: consider field precision while setting sle actual_qty (#35717)

(cherry picked from commit 3f62e854e58346b86bf510a60712ae1a364a3e9c)

# Conflicts:
#	erpnext/controllers/buying_controller.py

* chore: `conflicts`

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-06-15 20:18:17 +05:30
Rohit Waghchaure
f9f662679f test: added test case 2023-06-15 18:09:56 +05:30
Rohit Waghchaure
6e198188ff fix: incorrect gl entries for standalone debit note with update stock 2023-06-15 14:45:27 +05:30
Gursheen Anand
ba4ab06ae3 fix: changed account types in controller method 2023-06-14 12:39:16 +05:30
Anand Baburajan
491a50a027
fix: make showing taxes as table in print configurable (#35672) 2023-06-13 19:42:56 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value (#35668) 
I just applied semgrep autofix. Untested completed, review before merging.

```yaml
- id: frappe-set-value-semantics
  patterns:
    - pattern-either:
      - pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
      - pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
  fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
  message: |
    If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
  languages: [python]
  severity: ERROR
```
 2023-06-13 17:30:38 +05:30
Gursheen Anand
17341adf1c fix: calculate outstanding amount on reconcile correctly 2023-06-13 15:00:46 +05:30
Gursheen Anand
a06017c2c3 fix: Use advance account from Reconciliation document for fetching Payment Entries 2023-06-12 15:24:53 +05:30
Gursheen Anand
7591f1010b fix: Make get party account method return a list instead of a single default account. 2023-06-12 11:06:03 +05:30
Gursheen Anand
4ee163742a fix: Using one field for both advance liability accounts 2023-06-08 13:15:23 +05:30
Nabin Hait
5a0aacc0b6 fix: get party details 2023-06-06 15:39:22 +05:30
Smit Vora
b1ef19a0cd
fix(regional): allow regional override for updating gl_dict (#35550) 2023-06-05 01:43:26 +05:30
Rohit Waghchaure
acd12c5830 fix: get_query for batch number and incorrect batch qty 2023-06-04 16:09:01 +05:30
Rohit Waghchaure
e88c5d6d90 fix: travis for subcontracting module 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
d3ceb07936 fix: travis 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
648efca940 feat: auto create serial and batch bundle 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
0eaf6de5de feat: serial and batch bundle for POS 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
467046436b refactor: serial no ledger and batchwise balance history report 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
5bb3173676 refactor: rename doctype serial and batch ledger to serial and batch entry 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
16f26fb3d8 refactor: serial and batch package creation for finished item and cleanup code 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
86da306cca feat: added negative inventory validation and restrict to make backdated entry for serial nos 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
674bd3e2e5 feat: serial and batch bundle for Packing Items 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
5ddd55a8ae feat: serial and batch bundle for Subcontracting 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
e6143abb8a refactor: added new file serial batch bundle 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1 fix: removed sales and purchase fields from serial nos 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
bc75a7ef44 refactor: serial no normalization 2023-06-02 17:14:14 +05:30
Gursheen Anand
74619269f0 feat: Record Advance Payments as Liability 
Ability to let user record advance payments as liability instead of a negative asset.

Issue #34282
 2023-06-02 17:13:51 +05:30
Ankush Menat
686685bba0
fix: use kwargs in new_doc (#35497) 
To handle https://github.com/frappe/frappe/pull/21190#event-9386089620
 2023-05-31 12:50:14 +05:30
Deepesh Garg
bb21c044f6
fix: Billing Address display in buying transactions (#35451) 2023-05-31 11:02:30 +05:30
rohitwaghchaure
565322daba
Merge branch 'develop' into stock-reservation 2023-05-24 14:32:04 +05:30
Sagar Sharma
57ee473fa4 fix: don't recalculate rate for SCR rejected warehouse SLE 2023-05-22 15:07:39 +05:30
ruthra kumar
0da6c1688b
fix: unable to create partial invoice with auto fetch terms enabled (#35285) 
fix: fetch so/po terms if auto fetch is enabled
 2023-05-16 18:57:42 +05:30
Rohit Waghchaure
6e661e7c0e fix: force to do reposting for cancelled document 2023-05-16 16:23:52 +05:30
rohitwaghchaure
8afbb06a33
Merge branch 'develop' into FIX-ISS-23-24-00368 2023-05-15 13:42:20 +05:30
Indrajith.vs
0c8276ec82
fix: sales person allocated amount calculation error nonetype and float (#35293) 
fix: sales person allocated amount calculation error nontype and float
 2023-05-14 11:47:46 +05:30
HarryPaulo
e12e3bb012
fix: allow search leads by doctype search fields 
* fix: allow search leads by doctype search fields

* fix: allow search leads by doctype search fields, linters fix
 2023-05-14 08:08:47 +05:30
Rohit Waghchaure
38aaba5720 fix: inventory dimension for inter company transfer return use case 2023-05-13 13:00:05 +05:30