Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,492 Commits 3 Branches 0 Tags 1 GiB
9355641c49
Commit Graph

23523 Commits

Author SHA1 Message Date
Frappe ERPnext
9355641c49 refactor: logic moved to standard template 
Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
 2020-09-03 17:31:21 +02:00
Frappe ERPnext
a5d5e70bf4 Revert "feat: Option to print UOM after quantity" 
This reverts commit a787882a8f.
 2020-09-03 17:30:25 +02:00
Frappe ERPnext
f28bef868d feat: Checkbox for activation of printing UOM after quantity 
Checkbox will be added to Frappe after installation of ERPNext.
(Print Settings docType is part of frappe app, not erpnext app)
 2020-09-02 21:42:52 +02:00
Frappe ERPnext
be3b8a1c96 Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty 2020-09-02 21:31:31 +02:00
Anupam Kumar
c3984691b3
fix: Sales funnel data is inconsistent (#23110) 
* fix: Sales funnel data is inconsistent

* fix: data inconsistency

* fix: Converted Count

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-02 20:01:14 +05:30
rohitwaghchaure
3312956890
Merge pull request #23019 from prssanna/gross-profit-total 
feat: enable total row in Gross Profit Report
 2020-09-02 12:18:41 +05:30
rohitwaghchaure
1ab6c3fe94
Merge pull request #23059 from marination/credit-limit-email 
fix: Credit Limit Email not working
 2020-09-02 12:14:51 +05:30
rohitwaghchaure
efd1ac5840
Merge pull request #23050 from anupamvs/stock-entry-type 
fix: deleting unused Stock Entry Type
 2020-09-02 11:43:29 +05:30
rohitwaghchaure
f898c807b8
Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes 
Fix: job card issues
 2020-09-02 11:41:37 +05:30
Rohit Waghchaure
86a190652e fix: incorrect job card timer issue 2020-09-02 11:04:56 +05:30
rohitwaghchaure
6a51f3929b
Merge pull request #23054 from marination/general-ledger-filters 
fix: General Ledger filter validation
 2020-09-01 17:53:32 +05:30
Deepesh Garg
36b7bb0282
Merge pull request #23229 from deepeshgarg007/gst_template_update 
fix: Update tax template on supplier address change
 2020-09-01 16:27:44 +05:30
Marica
329292b9c3
Merge branch 'develop' into credit-limit-email 2020-09-01 16:18:12 +05:30
Deepesh Garg
cebf803455 fix: Update tax template on supplier address change 2020-09-01 16:15:28 +05:30
rohitwaghchaure
a3dd156a8a
Merge pull request #22796 from anupamvs/variance-report-fix 
fix: Target variance report signs
 2020-09-01 15:12:21 +05:30
rohitwaghchaure
9bbb9dad8b
Merge pull request #23217 from anupamvs/product-contact-us-v13 
fix: contact us button issue
 2020-09-01 15:10:37 +05:30
Afshan
eb4b2aa142
fix: get_items from product bundle for purchase order (#22821) 
* fix: get_items from product bundle for purchase order

* fix: Don't overwrite  doctype while setting attributes in child row

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-01 15:01:32 +05:30
Shivam Mishra
d19947fccd
Merge pull request #23148 from scmmishra/feat-exotel-customer-link 2020-09-01 13:47:31 +05:30
Shivam Mishra
e91a5437bd
Merge pull request #23038 from scmmishra/iff-invoicing 2020-09-01 13:35:32 +05:30
Shivam Mishra
1b5de62454
Merge pull request #23121 from Mangesh-Khairnar/add-integrations-desk-page 
feat: add integrations desk page
 2020-09-01 13:34:52 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix 2020-09-01 09:31:22 +05:30
Deepesh Garg
37cb44e109
Merge pull request #23127 from marination/quoted-item-report-v2 
feat: Quoted Item Comparison Report Enhancements v2
 2020-08-31 21:28:56 +05:30
Deepesh Garg
26eab47851
Merge pull request #23221 from deepeshgarg007/pending_principal 
fix: Pending amount after loan closure request
 2020-08-31 21:25:53 +05:30
Deepesh Garg
14718e2bde fix: Add unit test for pending principal amount 2020-08-31 21:21:05 +05:30
Afshan
1dc9a9b669
fix: reverse journal entry for multi-currency (#23165) 
* fix: reverse journal entry for multi-currency

* fix: test case for reverse journal entry
 2020-08-31 20:35:05 +05:30
marination
bc6c4e864d fix: Status in Report and filter query 2020-08-31 20:32:17 +05:30
Deepesh Garg
25042a22eb fix: Pending amount after loan closure request 2020-08-31 19:17:29 +05:30
Deepesh Garg
bdc933b3d3
Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation 
fix: Cancellation of accounting transactions within closed accounting period
 2020-08-31 17:16:55 +05:30
Deepesh Garg
d79b511e3f
Merge pull request #22950 from deepeshgarg007/billing_address_fetch 
fix: Add default billing address for purchase documents
 2020-08-31 17:16:31 +05:30
Deepesh Garg
5523142ced
Merge pull request #23078 from deepeshgarg007/hsn_wise_json 
feat: JSON download for HSN wise outward summary
 2020-08-31 17:16:03 +05:30
Deepesh Garg
56ddf41873
Merge pull request #23211 from michellealva/tax-cat 
feat: Allow Rename for Tax Category
 2020-08-31 15:56:43 +05:30
Anupam K
f9f26d2fa4 fix: contact us button issue 2020-08-31 14:34:42 +05:30
Rohit Waghchaure
d0aafece32 fix: incorrect completed qty against operation in work order if workstation is different in job card 2020-08-31 13:41:17 +05:30
Rohit Waghchaure
a5963e1b2c fix: user created manual job card not linking job card operations with work order operations 2020-08-31 13:40:55 +05:30
Rohit Waghchaure
e7ab53a711 fix: completed qty not updated in work order 2020-08-31 13:40:01 +05:30
Shivam Mishra
d70e711aea
fix: events not deleted on cancelling maintenance schedule (#22954) 
* feat: add participant to event_participant child table

* feat: add tests

* chore: update function name

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-31 13:14:32 +05:30
Deepesh Garg
d1b88af5b6
Merge pull request #23213 from deepeshgarg007/loan_disbursement_utility 
feat: Utility function to get possible loan disbursal amount
 2020-08-31 12:53:08 +05:30
Marica
ee56d0e0a9
Merge branch 'develop' into quoted-item-report-v2 2020-08-31 12:45:05 +05:30
Shivam Mishra
1c96befbaf
Merge branch 'develop' into feat-exotel-customer-link 2020-08-31 11:47:06 +05:30
Shivam Mishra
b4e0d300f7
Merge branch 'develop' into iff-invoicing 2020-08-31 11:46:41 +05:30
Marica
d2d350ce14
Merge branch 'develop' into credit-limit-email 2020-08-31 11:45:15 +05:30
Deepesh Garg
e8b121c2c2 fix: Add status in field list 2020-08-31 11:31:48 +05:30
Deepesh Garg
ce29757bff fix: Import flt 2020-08-31 11:26:51 +05:30
Deepesh Garg
a03ebf007c
Merge pull request #23212 from marination/customer-from-quotation 
fix: Better error feedback on creating SO from Quotation
 2020-08-30 23:24:02 +05:30
Deepesh Garg
a4259208e7 feat: Utility function to get possible loan disbursal amount 2020-08-30 23:09:23 +05:30
marination
e268d294b3 fix: Better error feedback on creating SO from Quotation 2020-08-30 21:01:34 +05:30
michellealva
c71e37c988 feat: Allow Rename for Tax Category 2020-08-30 19:42:24 +05:30
Syed Mujeer Hashmi
b23840bf7b fix: Filter out cancelled entries in customer ledger summary 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2020-08-29 23:09:18 +05:30
rohitwaghchaure
2badd93d8f
Merge pull request #23193 from bhavesh95863/patch-10 
fix: can't multiply sequence by non-int of type 'float
 2020-08-28 20:01:05 +05:30
rohitwaghchaure
7c61779a94
Merge pull request #23195 from marination/purchase-over-receipt-subcontracted 
fix: Raise Error on over receipt/consumption for sub-contracted PR
 2020-08-28 19:59:51 +05:30