Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,561 Commits 36 Branches 190 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

4624 Commits

Author SHA1 Message Date
Laurent Destailleur
0f2a8d0262 Fix timestamp field 2020-12-08 17:20:45 +01:00
Alexandre SPANGARO
78dc1eaa83 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-08 13:51:01 +01:00
Hystepik
3d674abfae Merge branch 'develop' into develop#2 2020-12-08 09:01:20 +01:00
Hystepik
2ac98d06f5 Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Frédéric FRANCE
a2eab824c1 Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
Frédéric FRANCE
914d2ae7f7 Merge remote-tracking branch 'upstream/develop' into patch-13 2020-12-04 20:40:35 +01:00
Laurent Destailleur
4ba31ae52e Debug missing column packaging 2020-12-04 19:40:56 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
Florian HENRY
7a5a6a14f0 fix At install insert shipment mode failed 2020-12-04 09:10:36 +01:00
Alexandre SPANGARO
13f985d280 NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty 2020-12-04 04:13:42 +01:00
Laurent Destailleur
8a7f7b3551 FIX Request on purchase orders in timeout even on very small databases 2020-12-03 18:38:18 +01:00
Laurent Destailleur
210ccc4b43 FIX Missing very important performance indexes 2020-12-03 18:34:32 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
 2020-12-03 11:26:53 +01:00
Hystepik
4830f4a3b4 Merge branch 'develop' into develop#2 2020-12-03 11:05:00 +01:00
lmarcouiller
647294e88e fix #15384 migration 2020-12-03 11:04:24 +01:00
lmarcouiller
e08f6aeb2b Fix #15383 2020-12-03 11:00:29 +01:00
Hystepik
7fc050e3ce Merge branch 'develop' into develop#3 2020-12-03 10:39:25 +01:00
Laurent Destailleur
56d5cd0402 Fix missing .php into name of boxes added into llx_boxes_def 2020-12-03 10:22:53 +01:00
Hystepik
ecb5a3b028 Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235 changes to not diplay won and lost and add on migration 2020-12-03 10:11:16 +01:00
Laurent Destailleur
450aa7cbea Merge pull request #15597 from dolibit-ut/patch-51 
Update llx_accounting_abc.sql
 2020-12-02 19:47:19 +01:00
Laurent Destailleur
4c8043bd9f Merge pull request #15598 from dolibit-ut/patch-52 
Update llx_const.sql
 2020-12-02 19:17:31 +01:00
Laurent Destailleur
37b6a15dbb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-02 19:13:44 +01:00
Laurent Destailleur
d88173d7ba Fix bad column 2020-12-02 19:13:32 +01:00
Laurent Destailleur
9d2a78003e Merge pull request #15606 from Zebedeu/develop 
New add VAT RAT for Angola
 2020-12-02 18:34:32 +01:00
Laurent Destailleur
38b67b0de6 Merge pull request #15616 from dolibit-ut/patch-54 
Update llx_accounting_account_ca.sql
 2020-12-02 18:31:58 +01:00
Laurent Destailleur
409b73fe2c FIX #15582 2020-12-02 15:16:04 +01:00
Marcio Zebedeu
561c7438bc New Add Angola City name 
Angola province/city support added
 2020-12-02 12:36:15 +01:00
Marcio Zebedeu
73edd081dd New Support for Angolan currency added 
Support for Region  Angola added
 2020-12-02 12:04:35 +01:00
UT from dolibit
8944670c03 Update llx_accounting_account_ca.sql 
subtype_pcg removed
 2020-12-02 08:28:16 +01:00
Stephane Lesage
1c4876b417 more transporters in llx_c_shipment_mode.sql 2020-12-01 21:17:03 +01:00
Marcio Zebedeu
f7a8a02b98 Update llx_c_tva.sql 2020-12-01 20:07:58 +01:00
Marcio Zebedeu
de9a32972f New currency for Angolan added 
Support for Angolan currency added
 2020-12-01 19:48:49 +01:00
Marcio Zebedeu
ea1393a7cb New add VAT RAT for Angola 
VAT rate support for Angola was added.
 2020-12-01 19:29:11 +01:00
lmarcouiller
bca89fc204 add dolibarr_state_board in migration 2020-12-01 15:57:15 +01:00
UT from dolibit
9d1da25f03 Update llx_const.sql 2020-12-01 13:57:33 +01:00
UT from dolibit
f847425f23 Update llx_accounting_abc.sql 2020-12-01 13:48:18 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
 2020-11-29 21:35:03 +01:00
Laurent Destailleur
6a8ddacb33 Prepare database to allow to disconnect other session after a password 
change
 2020-11-29 21:01:57 +01:00
Laurent Destailleur
de98ef1718 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2020-11-29 20:57:43 +01:00
Laurent Destailleur
d45fe6c17f FIx #15551 2020-11-29 20:39:39 +01:00
Laurent Destailleur
fab9b3d50c Fix warning 2020-11-28 18:34:13 +01:00
Frédéric FRANCE
1704de39bb Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-27 11:18:04 +01:00
Frédéric FRANCE
9a2f945807 Merge remote-tracking branch 'upstream/develop' into patch-13 2020-11-27 11:15:10 +01:00
BENKE Charlene
c2bd30a7e9 working progress 2020-11-26 11:59:00 +01:00
BENKE Charlene
c860c0dc4a Add default BOM 2020-11-26 11:47:45 +01:00
Laurent Destailleur
e1a6e8f2fc CSS 
Security: Add param to fight against Clickjacking attacks
 2020-11-26 11:29:16 +01:00
Laurent Destailleur
d8bf7b2714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
 2020-11-25 18:04:06 +01:00
Laurent Destailleur
ac859bc38e Merge pull request #15531 from FHenry/develop 
Fix bank transfert supplier
 2020-11-25 13:06:10 +01:00
Frédéric FRANCE
c09a6d1435 Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-25 12:59:32 +01:00