Alexandre SPANGARO
|
593f5bcb7a
|
Merge remote-tracking branch 'upstream/develop' into 14a5
|
2020-12-15 06:50:22 +01:00 |
|
Laurent Destailleur
|
5778b1f022
|
Merge pull request #15744 from frederic34/mycompanysocialnetworks
my company social networks
|
2020-12-13 12:54:22 +01:00 |
|
Frédéric FRANCE
|
4c09e14c49
|
fix sql error
|
2020-12-13 10:32:23 +01:00 |
|
Frédéric FRANCE
|
1b75ac9ffe
|
add github
|
2020-12-12 21:17:18 +01:00 |
|
Laurent Destailleur
|
bfa8383bed
|
Fix migration script
|
2020-12-12 12:30:13 +01:00 |
|
Laurent Destailleur
|
33bb1919f0
|
Merge branch 'develop' into develop#3
|
2020-12-12 12:23:33 +01:00 |
|
Laurent Destailleur
|
4fa1248d15
|
Fix avoid duplicate rows after double migration
|
2020-12-11 16:53:03 +01:00 |
|
lmarcouiller
|
a5cf177025
|
Close #15729 : first push
|
2020-12-11 15:22:29 +01:00 |
|
Laurent Destailleur
|
a5eb2e56cb
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/card.php
|
2020-12-08 22:27:27 +01:00 |
|
Laurent Destailleur
|
75b8794d72
|
Fix column must be NULL
|
2020-12-08 22:23:24 +01:00 |
|
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 |
|