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 |
|
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 |
|
Frédéric FRANCE
|
4f3b732ed5
|
Update societe.class.php
|
2020-10-27 20:14:42 +01:00 |
|
Laurent Destailleur
|
7b20e703ee
|
Clean code
|
2020-10-17 15:53:31 +02:00 |
|
Florian HENRY
|
0cb04d14d7
|
NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late
|
2020-10-15 12:20:37 +02:00 |
|
Laurent Destailleur
|
a0b17635fd
|
NEW When creating a user from a member linked to a thirdparty, you can
decide if it is an internal or external (default) user.
|
2020-10-14 14:02:07 +02:00 |
|
Alexandre SPANGARO
|
ca7ad35342
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-10-09 06:39:42 +02:00 |
|
Laurent Destailleur
|
ed3a4de438
|
Fix security hole
|
2020-10-08 14:30:59 +02:00 |
|
Laurent Destailleur
|
7c6c319607
|
Trans
|
2020-10-06 09:31:54 +02:00 |
|
Laurent Destailleur
|
1b83b55995
|
Fix to exclude possible sql injection
|
2020-09-25 17:11:54 +02:00 |
|
Laurent Destailleur
|
e5cca13ea0
|
Fix escaping
|
2020-09-20 03:32:43 +02:00 |
|
Sekan, Tobias
|
ac1fdb4a59
|
Use new table function for comm/propal + cleanup
|
2020-09-16 10:51:19 +02:00 |
|
Laurent Destailleur
|
e5191cad24
|
Move code of incoterm into the Incoterm Trait.
|
2020-09-16 02:50:18 +02:00 |
|
Laurent Destailleur
|
1f8278c8ca
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-09-12 04:42:59 +02:00 |
|
Laurent Destailleur
|
5ea3f09e17
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
|
2020-09-12 04:29:28 +02:00 |
|
Laurent Destailleur
|
f06737097f
|
Look and feel v13
|
2020-09-10 16:37:42 +02:00 |
|