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

3046 Commits

Author SHA1 Message Date
Deepesh Garg
3ead70ba3c
fix: Change IBAN Account length from 25 to 30 (#16847) 2019-03-18 08:22:57 +05:30
rohitwaghchaure
fd33c55760
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit 
feat: added provision to disable CWIP accounting in asset settings
 2019-03-16 12:18:36 +05:30
Bassam Ramadan
e14758c897 fix: add returns field to cashier closing (#16911) 2019-03-14 15:01:50 +05:30
Rohit Waghchaure
821a002125 feat: added provision to disable CWIP accounting in asset settings 2019-03-08 10:51:37 +05:30
Rohit Waghchaure
db8500c03a POS profile, account for change amount must be cash or bank account 2019-03-06 18:28:45 +05:30
Rushabh Mehta
1f0792d5ea
Merge pull request #16823 from jay-parikh/sales-return 
fix: Python 3 Sales Invoice Return Validation "validate_pos"
 2019-03-05 08:05:00 +05:30
rohitwaghchaure
e552170ce6
Merge pull request #16704 from Anurag810/vedmata-print-formats 
feat: Auditors print formats
 2019-03-04 16:58:31 +05:30
rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report 
feat: Gross and Net Profit Report
 2019-03-04 16:57:21 +05:30
Anurag Mishra
0c9945e0bf Minor fixes 2019-03-04 16:14:53 +05:30
Anurag Mishra
02138b6bfc fix: gross depends upon now report type 2019-03-04 14:46:28 +05:30
Anurag Mishra
1e4e61bd94 Minor fixes 2019-03-04 12:36:51 +05:30
Jay Parikh
c2090939d7 Fix Sales Invoice Return Validation "validate_pos" 2019-03-02 12:19:32 +00:00
Gaurav
b30a9b1869 fix(regional,italy): bank details, custom button on sales invoice 
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
 2019-03-01 12:38:35 +05:30
Rushabh Mehta
76f36f68d3
Merge pull request #16790 from crossxcell99/master 
fix: call base class onload method
 2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808 fix: call base clase onload method 2019-02-26 18:01:37 +01:00
Suraj Shetty
5636f924a9 fix: get mode of payment while selecting payment term in payment term template (#16765) 2019-02-25 12:43:34 +05:30
Saurabh
47738f9792
Merge pull request #16750 from nabinhait/cc-against-bs 
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
 2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty 
fix: Consider returned qty while making invoice from DN / PR
 2019-02-21 18:11:37 +05:30
Nabin Hait
b24caad789 fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings 2019-02-21 17:11:35 +05:30
Nabin Hait
26972c954d fix: Validate serial no usage in invoice considering multi company transaction 2019-02-21 14:32:41 +05:30
Nabin Hait
816a4655a0 fix: Consider returned qty while making invoice from DN / PR 2019-02-21 12:02:36 +05:30
rohitwaghchaure
c18e925d61 fix: Moved regional methods from controller to hooks (#16736) 2019-02-20 17:13:15 +05:30
Nabin Hait
21706894af
Merge pull request #16705 from deepeshgarg007/pos-precision 
fix: Fetch precision form system settings in Sales invoice payment(POS)
 2019-02-19 15:06:56 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix 2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978
Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule 
fix: multi-uom not working for the pricing rule rate
 2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix 
fix: Removed precision from multiple doctypes
 2019-02-19 15:03:00 +05:30
Gaurav
f1e28e0e8d mod(regional,italy): Updates to Italian Localization 
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
 2019-02-19 10:39:22 +05:30
deepeshgarg007
de0f59b818 fix: Removed precision from multiple doctypes 2019-02-19 08:40:16 +05:30
Rohit Waghchaure
5821b672ad fix: multi-uom not working for the pricing rule rate 2019-02-18 20:07:44 +05:30
deepeshgarg007
9a19e06856 fix: Change Received qty to accepted qty and validation for indicators 2019-02-18 18:42:15 +05:30
deepeshgarg007
48a7262fae fix: Precision issue in POS payment 2019-02-18 15:05:36 +05:30
Anurag Mishra
879e5fd8bb remove print and codacy 2019-02-18 14:43:55 +05:30
Anurag Mishra
42a106c7ba Auditors print formats 2019-02-18 14:35:33 +05:30
Sagar Vora
4e92414850
Merge branch 'hotfix' into gross-and-net-profit-report 2019-02-11 16:00:28 +05:30
Anurag Mishra
a032f0528e new report gross-and-net-profit-report 2019-02-11 13:12:44 +05:30
Nabin Hait
e3b0f4f9f6 fix: removed account type filter on employee advance account 2019-02-08 16:56:26 +05:30
Chinmay Pai
125505f2aa
fix(purchase_invoice): fix undefined variable 
fixes issue while creating purchase invoice

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-04 16:30:20 +05:30
Aditya Hase
66833f109b fix(accounts): fetch subscription details only if required fields are populated 2019-01-30 19:40:40 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
rohitwaghchaure
a95ed44d3d fix: test case for fiscal year (#16516) 2019-01-29 16:24:53 +05:30
Sagar Vora
8f6509fa9a
Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months 2019-01-29 13:04:20 +05:30
Sagar Vora
9520e345bd
fix: better error messages 2019-01-29 13:03:46 +05:30
Rohit Waghchaure
a8e743e3c4 fix: fiscal year always be for 12 months 2019-01-29 12:55:04 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue 2019-01-29 11:29:41 +05:30
Nabin Hait
ff2922cbbb
Merge pull request #16488 from deepeshgarg007/price_list 
fix(sales_invoice): fetch customer price list if available before pos price list
 2019-01-29 11:24:22 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
deepeshgarg007
4e4b200972 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue 2019-01-27 22:54:34 +05:30
deepeshgarg007
c2ffcc5e71 feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher 2019-01-27 16:09:07 +05:30
deepeshgarg007
76556e1a3e Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list 2019-01-25 16:50:06 +05:30
Nabin Hait
e21bdf020c
Merge pull request #16472 from deepeshgarg007/cost_center 
fix(cost_center): Bug fix in  update_cost_center_number argument name
 2019-01-25 09:56:52 +05:30