hanzoai/erp
2
0
Fork 0
mirror of https://github.com/hanzoai/erp.git synced 2026-09-30 21:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,869 Commits 2 Branches 0 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mohammad Hasnain Mohsin RajanAnkushAnkush
 		00f90c50c0 chore: add product listing link in settings (#26026) 
* chore: add product listing link in settings

* chore: add icon in workspace card

Co-authored-by: Ankush <[email protected]>
 2021-07-07 18:21:12 +05:30
Mohammad Hasnain Mohsin RajanGitHubAnkush
 		290350c86f chore: add product listing link in settings (#26026) 
* chore: add product listing link in settings

* chore: add icon in workspace card

Co-authored-by: Ankush <[email protected]>
 2021-07-07 12:10:02 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 21e662f678 fix: apply permission while selecting projects (#25765) 2021-05-20 17:20:05 +05:30
Mohammad Hasnain Mohsin RajanGitHubAnkush Menat
 		e85770fe3f fix: bank statement import via google sheet (#25676) 
* fix: google sheet bank statement import

* fix: quotes

Co-authored-by: Ankush Menat <[email protected]>

* chore: add translation

Co-authored-by: Ankush Menat <[email protected]>

* chore: grammar

Co-authored-by: Ankush Menat <[email protected]>

* fix: remove comment

Co-authored-by: Ankush Menat <[email protected]>
 2021-05-13 17:33:18 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 7c6de1a8ac fix: bank statement import via google sheet (#25677) 
* fix: change links in workspace

* fix: google sheet bank statement import

* chore: quotes

* fix: capitalization

* fix: typo

* chore: add translation
 2021-05-13 17:28:49 +05:30
Mohammad Hasnain Mohsin RajanandGitHub e7a2fdd81a fix: change links in workspace (#25674) 2021-05-12 13:02:32 +05:30
Mohammad Hasnain Mohsin RajanandGitHub dd1822ef58 fix: change links in workspace (#25673) 2021-05-12 13:01:53 +05:30
Mohammad Hasnain Mohsin RajanandGitHub af8436d0dc fix: change links in workspace (#25670) 2021-05-12 13:01:03 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 0dc00219e8 fix: coveralls different services for different events (#25513) 2021-04-29 15:21:16 +05:30
Mohammad Hasnain Mohsin RajanandGitHub c9187b00af fix: change coveralls version (#25499) 2021-04-28 13:32:27 +05:30
Mohammad Hasnain Mohsin RajanGitHubSaqib
 		7f932cfb30 fix: display reconcile tool when closing balance 0 (#25417) 
Co-authored-by: Saqib <[email protected]>
 2021-04-22 04:53:09 +05:30
[email protected] e9c801e4bd fix: ams integration breaks when error raised 2021-03-26 14:32:02 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 52701dcbbc fix: patch regional fields for old companies (#24988) 2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin RajanandGitHub f29c075bc3 fix: patch regional fields for old companies (#24999) 
* fix: patch regional fields for old companies

* chore: fix sider
 2021-03-25 12:56:13 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 192ab05869 ci: use ubuntu 18 specifically (#24904) 2021-03-18 17:12:12 +05:30
Mohammad Hasnain Mohsin RajanGitHubSagar Vora
 		7f906f9aaa chore: add sider config (#24892) 
Co-authored-by: Sagar Vora <[email protected]>
 2021-03-17 20:06:35 +05:30
Mohammad Hasnain Mohsin RajanGitHubSagar Vora
 		46d5431bad fix: Github Action not failing when tests fail (#24867) 
Co-authored-by: Sagar Vora <[email protected]>
 2021-03-15 11:17:19 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 0f60f08f3e ci: Port CI test from Travis to Github Actions (#24846) 2021-03-12 14:09:52 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 8cdba8ab64 fix: ams integration breaks when error raised (#24383) 2021-02-25 18:36:19 +05:30
Mohammad Hasnain Mohsin RajanGitHubNabin Hait
 		07f40596bc feat(Bank Reconciliation): Redesign (#24273) 
Co-authored-by: Nabin Hait <[email protected]>
 2021-02-22 22:19:47 +05:30
Mohammad Hasnain Mohsin RajanGitHubAfshan
 		00981206ad fix: last purchase rate not updating when voucher cancelled if only one voucher is present (#24322) 
* fix: last purchase rate not updating

* chore: use orm for updating

Co-authored-by: Afshan <[email protected]>
 2021-01-14 19:23:18 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 11176852eb Merge branch 'develop' into bugfix_typo_update 2020-12-30 20:59:38 +05:30
[email protected] 46d5f4c7f1 refactor(analytics report): linting 2020-12-25 16:34:43 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 61b92b312a Merge branch 'develop' into fix-analytics-reports 2020-12-22 12:41:43 +05:30
[email protected] 2da0035a0f Merge branch 'develop' into fix-analytics-reports 2020-12-16 16:14:23 +05:30
[email protected] 9962ba86d0 fix: charts not displaying when tree_type changed 2020-12-16 14:41:04 +05:30
Mohammad Hasnain Mohsin RajanandGitHub c553453825 fix: user is not a field (#24129) 2020-12-15 16:29:10 +05:30
Mohammad Hasnain Mohsin RajanandGitHub b59d573009 Merge branch 'develop' into add-fb-to-je 2020-12-14 11:13:46 +05:30
Mohammad Hasnain Mohsin RajanGitHubRucha Mahabal
 		f8d6726990 fix(acc recv report): columns mismatch (#24109) 
Co-authored-by: Rucha Mahabal <[email protected]>
 2020-12-11 13:28:23 +05:30
Mohammad Hasnain Mohsin RajanandGitHub f60e303ac7 Merge branch 'develop' into add-fb-to-je 2020-12-11 09:35:36 +05:30
Mohammad Hasnain Mohsin RajanGitHubMarica
 		8abe7b91fe fix: linting 
Co-authored-by: Marica <[email protected]>
 2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin RajanGitHubMarica
 		ce1ca28296 fix: linting 
Co-authored-by: Marica <[email protected]>
 2020-12-10 17:48:05 +05:30
Mohammad Hasnain f82997e3c3 fix(asset_val_adj): fb not getting added in je 2020-12-10 13:34:01 +05:30
Mohammad Hasnain Mohsin RajanandGitHub deaf2e80cb fix: linting 2020-12-09 12:36:14 +05:30
Mohammad Hasnain 69514c4761 fix: scan barcode does not update barcode item field in sales order 2020-12-09 12:10:28 +05:30
Mohammad Hasnain 59dffb96b3 fix(Production Planning): incorrect required qty 2020-12-08 11:13:00 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 90e33e53fd refactor: Format translation strings (#24004) 
* fix: translation strings

* fix: linting
 2020-11-25 15:37:54 +05:30
Mohammad Hasnain Mohsin RajanandGitHub e15b6a91de Filters for tax templates (#23998) 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
 2020-11-25 15:36:41 +05:30
Mohammad Hasnain Mohsin RajanandGitHub e4755828c4 fix: template errors in pricing rule (#23999) 
* fix: solve microtemplating errors
 2020-11-24 23:31:06 +05:30
Mohammad Hasnain d2477e6cc5 fix(UAE VAT 201): remove branch parts 2020-11-16 18:47:05 +05:30
Mohammad Hasnain 2e1787300d feat(UAE VAT 201): emirate according to branch 2020-11-16 17:36:27 +05:30
Mohammad Hasnain b8d0b546a7 feat(UAE VAT Format): use company address for emir 2020-11-16 12:58:38 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 72adb0b218 Merge branch 'develop' into UAE-VAT-Format 2020-11-10 09:58:45 +05:30
Mohammad Hasnain Mohsin RajanandGitHub d54969bd86 Merge branch 'develop' into UAE-VAT-Format 2020-11-06 23:39:34 +05:30
Mohammad Hasnain c5aad7b6e5 feat(UAE VAT 201): reorder desk page listing 2020-11-06 23:36:50 +05:30
Mohammad Hasnain 4d99d695a3 feat(uae vat 201): update desk page entry 2020-11-06 23:33:19 +05:30
Mohammad Hasnain bed4e85aec fix(uae vat 201): date filters were not working 2020-11-04 10:44:22 +05:30
Mohammad Hasnain 510d0d3f20 Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format 2020-11-04 10:32:22 +05:30
Mohammad Hasnain f2c895ddb5 feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise 2020-11-04 10:31:37 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 2b2961678c Merge branch 'develop' into UAE-VAT-Format 2020-11-04 08:43:21 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 6a0b28bde3 Merge branch 'develop' into UAE-VAT-Format 2020-11-02 23:59:13 +05:30
Mohammad Hasnain 7a034595fe fix(UAE VAT 201): Remove Chart 2020-11-02 13:12:27 +05:30
Mohammad Hasnain b0eca23485 Refactor(UAE VAT 201): Fix fomatiing 2020-11-02 12:47:10 +05:30
Mohammad Hasnain c53237f5e0 refactor(UAE VAT 201): solve syntax errors 2020-11-02 11:02:41 +05:30
Mohammad Hasnain Mohsin RajanandGitHub c8d8d0868d Merge branch 'develop' into UAE-VAT-Format 2020-11-02 10:36:03 +05:30
Mohammad Hasnain Mohsin RajanGitHubShivam Mishra
 		d322181fd7 refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/uae_vat_201.py 
Co-authored-by: Shivam Mishra <[email protected]>
 2020-11-02 10:29:38 +05:30
Mohammad Hasnain Mohsin RajanGitHubShivam Mishra
 		7b771d139c refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <[email protected]>
 2020-11-02 10:29:14 +05:30
Mohammad Hasnain Mohsin RajanGitHubShivam Mishra
 		46265d3fc7 refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <[email protected]>
 2020-11-02 10:28:41 +05:30
Mohammad Hasnain Mohsin RajanGitHubShivam Mishra
 		be7a4c8b0a refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <[email protected]>
 2020-11-02 10:28:14 +05:30
Mohammad Hasnain Mohsin RajanGitHubShivam Mishra
 		f116fbf84d refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <[email protected]>
 2020-11-02 10:27:54 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 30197d7fba Merge branch 'develop' into UAE-VAT-Format 2020-10-30 10:29:56 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 55c78b17ba fix(UAE VAT 201): change desk page record 2020-10-29 12:43:43 +05:30
Mohammad Hasnain eb3084b072 refactor(UAE VAT 201): break functions 2020-10-29 09:52:17 +05:30
Mohammad Hasnain bf261a6c39 fix(UAE VAT 201): fix helper 2020-10-29 00:07:52 +05:30
Mohammad Hasnain 08846f6b11 refactor(UAE VAT 201): replace cartesian product to inner joins 2020-10-28 23:33:56 +05:30
Mohammad Hasnain 2c00549dfe refactor(UAE VAT 201): Use frappe api instead sql 2020-10-28 22:54:56 +05:30
Mohammad Hasnain Mohsin RajanandGitHub 6e9e6d2491 Merge branch 'develop' into UAE-VAT-Format 2020-10-28 21:06:11 +05:30
Mohammad Hasnain 81f2efd9b0 chore(UAE VAT 201): Rename emirate to vat emirate 2020-10-28 10:28:25 +05:30
Mohammad Hasnain 5953acab8b chore(UAE VAT 201): cleanup 2020-10-25 15:43:21 +05:30
Mohammad Hasnain 0ceae0bd66 feat(UAE VAT 201): emirate customizable 2020-10-25 13:06:42 +05:30
Mohammad Hasnain 0ac40c75aa chore(UAE VAT): update tesr dependencies 2020-10-25 01:16:06 +05:30
Mohammad Hasnain 8796567b42 chore(UAE VAT 201): add puctuation 2020-10-20 16:35:28 +05:30
Mohammad Hasnain 33e9a1ab31 refactor(UAE VAT 201): solve linting issues 2020-10-20 13:04:38 +05:30
Mohammad Hasnain 6a24da4efd refactor(UAE VAT 201): break functions 2020-10-20 11:53:06 +05:30
Mohammad Hasnain c08591124c chore(UAE VAT 21): solve merge conflicts 2020-10-20 10:17:48 +05:30
Mohammad Hasnain 75ccb62d46 Merge branch 'develop' into UAE-VAT-Format 2020-10-20 09:40:44 +05:30
Mohammad Hasnain 78ec254da4 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-20 09:39:01 +05:30
Mohammad Hasnain 234036df32 chore(uae vat 201): solve travis issues 2020-10-20 07:42:10 +05:30
Mohammad Hasnain 853fd03f49 feat(uae vat 201): fix linter issues 2020-10-19 22:35:16 +05:30
Mohammad Hasnain 33cdfdfb7f feat(UAE VAT 201): Add tests for report 2020-10-19 20:48:43 +05:30
Mohammad Hasnain c1b8004757 feat(UAE VAT 21): claimable to recoverable 2020-10-19 20:47:56 +05:30
Mohammad Hasnain 32eb9a7893 feat(UAE VAT 201): claimable to recoverable 2020-10-19 17:58:50 +05:30
Mohammad Hasnain b9dc13294d chore(UAE VAT 201) solve translations issues 2020-10-14 16:56:26 +05:30
Mohammad Hasnain Mohsin Rajan abf628c95d Merge branch 'develop' into UAE-VAT-Format 2020-10-14 00:26:57 +05:30
hasnain2808 f8db9582c3 feat(UAE VAT 21): Add currency formatting 2020-10-01 12:59:39 +05:30
hasnain2808 8cc6f2b388 feat(UAE VAT 21): add fixed width to columns 2020-10-01 12:44:39 +05:30
hasnain2808 10a3a338b6 refactor: change uae vat settingplural 2020-09-30 21:51:00 +05:30
hasnain2808 3294f86b92 refactor: fix linting 2020-09-30 12:15:07 +05:30
hasnain2808 a5e8e449ee chore: Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:43:03 +05:30
hasnain2808 23c8966e81 Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:06:02 +05:30
hasnain2808 2c62d946f5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-09-28 20:03:27 +05:30
hasnain2808 80068e16e8 Refactor(UAE VAT 21): Replace f-strings by format 2020-09-28 18:58:27 +05:30
hasnain2808 587bb05a37 feat(UAE VAT 21): Add desk page for UAE VAT 21 2020-09-28 14:52:29 +05:30
hasnain2808 0860c74c82 feat(UAE VAT 21): Add permissions for doctypes 2020-09-28 14:38:45 +05:30
hasnain2808 2d30148940 feat(UAE VAT 21): Add vat settings 2020-09-28 14:38:14 +05:30
hasnain2808 2a601e59bf fix(UAE VAT 21): remove extra legend 2020-09-28 13:26:43 +05:30
hasnain2808 bed1add349 docs(UAE VAT 21): add docstrings 2020-09-28 13:26:05 +05:30
hasnain2808 815b7584dd refactor(UAE VAT 21): seperate get_chart, get_data 2020-09-28 13:24:40 +05:30
hasnain2808 79aca28453 refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21 2020-09-28 12:27:41 +05:30
hasnain2808 127fbfcb93 feat(UAE VAT 21): Added Print Format 2020-09-25 20:42:54 +05:30