Laurent Destailleur
|
1bf63c7862
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
|
2021-06-10 16:53:09 +02:00 |
|
Laurent Destailleur
|
24f8b6386e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/class/commonobject.class.php
|
2021-06-10 16:47:45 +02:00 |
|
Laurent Destailleur
|
b7ba9df6b4
|
Update societe.class.php
|
2021-06-10 12:59:04 +02:00 |
|
ATM john
|
1aca7efce3
|
Fix childtablesoncascade doc
|
2021-06-06 13:15:03 +02:00 |
|
Laurent Destailleur
|
71b35ef0e5
|
Fix regression - can't reset parent company
|
2021-05-25 12:11:06 +02:00 |
|
Laurent Destailleur
|
93501a1147
|
Fix phpcs
|
2021-05-20 15:25:56 +02:00 |
|
Laurent Destailleur
|
28487fac12
|
Create societe.class.php
|
2021-05-20 14:53:50 +02:00 |
|
stickler-ci
|
94ca682cbf
|
Fixing style errors.
|
2021-05-20 12:51:53 +00:00 |
|
Laurent Destailleur
|
b64c307358
|
Update societe.class.php
|
2021-05-20 14:50:02 +02:00 |
|
Laurent Destailleur
|
890d0f8040
|
Update societe.class.php
|
2021-05-20 14:38:24 +02:00 |
|
stickler-ci
|
b5ac78d9a0
|
Fixing style errors.
|
2021-05-19 16:56:52 +00:00 |
|
Sylvain Legrand
|
8a9c21c642
|
Update societe.class.php
|
2021-05-19 18:47:07 +02:00 |
|
Laurent Destailleur
|
1cf46f9ae9
|
cast int
|
2021-05-07 15:11:28 +02:00 |
|
Laurent Destailleur
|
ee7aacae54
|
More complete error message
|
2021-01-14 15:19:56 +01:00 |
|
Laurent Destailleur
|
170814c718
|
Fix missing rollback
|
2021-01-06 20:21:22 +01:00 |
|
Laurent Destailleur
|
3d96c5a454
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/admin/dict.php
htdocs/bom/tpl/objectline_create.tpl.php
htdocs/bom/tpl/objectline_edit.tpl.php
htdocs/bom/tpl/objectline_view.tpl.php
htdocs/core/boxes/box_shipments.php
htdocs/societe/class/societe.class.php
|
2021-01-06 20:20:37 +01:00 |
|
Laurent Destailleur
|
4f2c6e2901
|
Merge pull request #15911 from atm-kevin/Fix_create_contact_from_thirdparty_from_member
Fix #15829
|
2021-01-06 19:33:25 +01:00 |
|
kevin
|
5164a96aa0
|
Fix #15829
|
2021-01-06 15:35:33 +01:00 |
|
Laurent Destailleur
|
be2e3aa7a9
|
Merge pull request #15827 from fappels/13_php_warning_add_line
FIX add line php warning when no customer relative discount history.
|
2020-12-29 16:55:33 +01:00 |
|
Frédéric FRANCE
|
e4c3499cad
|
remove warnings
Conflicts:
htdocs/societe/class/societe.class.php
|
2020-12-29 16:48:29 +01:00 |
|
Francis Appels
|
4267828ee6
|
FIX add line php warning when no customer relative discount history.
|
2020-12-29 14:47:16 +01:00 |
|
Laurent Destailleur
|
f498657071
|
Fix warning
|
2020-12-29 04:44:48 +01:00 |
|
Laurent Destailleur
|
bf0a9fa137
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/societe/class/societe.class.php
|
2020-12-29 04:32:13 +01:00 |
|
Laurent Destailleur
|
c3326a0963
|
FIX Creation of thirdparty when setup is empty
|
2020-12-29 04:30:37 +01:00 |
|
Laurent Destailleur
|
361f13154b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/card.php
htdocs/margin/tabs/thirdpartyMargins.php
htdocs/societe/card.php
htdocs/societe/note.php
htdocs/societe/notify/card.php
htdocs/societe/societecontact.php
htdocs/ticket/list.php
|
2020-12-20 14:31:54 +01:00 |
|
Laurent Destailleur
|
8c87050703
|
FIX Check of customer/vendor code fails in some cases
|
2020-12-20 13:54:02 +01:00 |
|
Stephane Lesage
|
5e4cc7fcfd
|
companycard-directedit-typent
|
2020-12-14 10:14:31 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Laurent Destailleur
|
5bdd52500d
|
Fix warning
|
2020-12-02 15:47:56 +01:00 |
|
Laurent Destailleur
|
3632a7a02a
|
Fix warning
|
2020-12-01 15:50:59 +01:00 |
|
Laurent Destailleur
|
99e4aab46e
|
CSS
|
2020-11-30 20:31:22 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Scrutinizer Auto-Fixer
|
f6e3f58fcb
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-11-09 14:18:56 +00:00 |
|
Laurent Destailleur
|
a9fbe9dd6c
|
Fix remove warning
|
2020-11-08 00:18:41 +01:00 |
|
Frédéric FRANCE
|
6e7448a1d0
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-11-04 19:00:10 +01:00 |
|
Laurent Destailleur
|
83a7b19333
|
Look and feel v13
|
2020-11-02 11:41:07 +01:00 |
|
Frédéric FRANCE
|
49390a596c
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-31 20:33:59 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Frédéric FRANCE
|
be4a4cb54b
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-31 16:10:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Frédéric FRANCE
|
c4a7e58435
|
Update societe.class.php
|
2020-10-31 13:22:04 +01:00 |
|
Frédéric FRANCE
|
ae351a5659
|
doxygen
|
2020-10-31 13:13:55 +01:00 |
|
Frédéric FRANCE
|
ace1dc16f1
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-30 14:47:09 +01:00 |
|
Laurent Destailleur
|
64b9afc509
|
Fix bad column name
|
2020-10-30 14:33:16 +01:00 |
|
Frédéric FRANCE
|
e4af61a587
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-30 08:17:53 +01:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Frédéric FRANCE
|
30b67aaa4f
|
get thirdparty specimen with api
|
2020-10-29 23:56:42 +01:00 |
|
Frédéric FRANCE
|
fcb343e891
|
Update societe.class.php
|
2020-10-28 20:53:29 +01:00 |
|
Frédéric FRANCE
|
0ff32c7074
|
Update societe.class.php
|
2020-10-27 20:50:11 +01:00 |
|