Laurent Destailleur
|
ee7aacae54
|
More complete error message
|
2021-01-14 15:19:56 +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 |
|
Florian HENRY
|
4d32529e66
|
include
|
2020-12-21 15:25:15 +01:00 |
|
Florian HENRY
|
3deed4678c
|
fix: reslter API need to have correct params as comment
|
2020-12-21 15:23:04 +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 |
|
Laurent Destailleur
|
390eda871a
|
Update societeaccount.class.php
|
2020-12-07 22:30:24 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Laurent Destailleur
|
9cfb0ac969
|
Clean API
|
2020-12-04 23:55:47 +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 |
|
Laurent Destailleur
|
42c30584f4
|
Merge pull request #15522 from frederic34/patch-15
Update api_thirdparties.class.php
|
2020-11-25 12:53:36 +01:00 |
|
Laurent Destailleur
|
7bb6b24b96
|
Merge pull request #15505 from ptibogxiv/patch-394
Fix api contact
|
2020-11-25 12:52:45 +01:00 |
|
Frédéric FRANCE
|
9203cb1d88
|
fix api generateBankAccountDocument
|
2020-11-25 00:16:36 +01:00 |
|
Frédéric FRANCE
|
ba3ba7dd06
|
Update api_thirdparties.class.php
The variable $errors does not exist. Did you maybe mean $error?
|
2020-11-24 23:19:19 +01:00 |
|
ptibogxiv
|
51eed3efe5
|
Fix api contact
|
2020-11-24 12:03:31 +01:00 |
|
stickler-ci
|
11704ea6fb
|
Fixing style errors.
|
2020-11-23 22:33:45 +00:00 |
|
ptibogxiv
|
0d50402803
|
Update api_contacts.class.php
|
2020-11-23 23:31:46 +01:00 |
|
stickler-ci
|
c1ba61e548
|
Fixing style errors.
|
2020-11-23 21:55:36 +00:00 |
|
ptibogxiv
|
f227d5e72a
|
Update api_contacts.class.php
|
2020-11-23 22:53:56 +01:00 |
|
ptibogxiv
|
28e4be3b0e
|
Fix contact API
Get roles by API (without GET this data, we can't add this to POST, so data was deleted 👎 )
|
2020-11-22 16:25:38 +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 |
|
Laurent Destailleur
|
eba73101b9
|
Merge pull request #15210 from frederic34/zapieruser
work on zapier
|
2020-11-06 18:49:23 +01:00 |
|
Frédéric FRANCE
|
5940fb1391
|
doxygen
|
2020-11-05 23:03:44 +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 |
|
Frédéric FRANCE
|
8bf2b1797c
|
tabs
|
2020-10-31 15:59:33 +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 |
|
Laurent Destailleur
|
1af3709793
|
Merge pull request #15232 from frederic34/patch-6
doxygen
|
2020-10-31 13:50:28 +01: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
|
72c443868c
|
Update api_thirdparties.class.php
|
2020-10-31 11:57:35 +01:00 |
|
Frédéric FRANCE
|
25741a618e
|
fix result is a resource
|
2020-10-31 09:50:50 +01:00 |
|
Frédéric FRANCE
|
0b9c866825
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-31 09:08:07 +01:00 |
|