Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-08 10:03:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,177 Commits 37 Branches 191 Tags
ce035eb4cebb52e13f9f327debcfe62d221d12f4
Commit Graph

3699 Commits

Author SHA1 Message Date
Laurent Destailleur
4c00167687 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/card.php
 2021-01-06 20:51:44 +01:00
Laurent Destailleur
8f1617884a Merge pull request #15888 from atm-quentin/FIX/issue_15659 
FIX issue 15659 : Missing test if supplier conf is enabled
 2021-01-06 20:35:34 +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
quentin
7161ca9e70 FIX issue 15659 : Missing test if conf is enabled 2021-01-06 09:54:02 +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
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +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
Laurent Destailleur
1f9c597f26 Fix default fields in list 2020-12-16 15:57:52 +01:00
Laurent Destailleur
7005c17569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/card.php
 2020-12-16 00:32:18 +01:00
stickler-ci
9ca2e98a66 Fixing style errors. 2020-12-15 21:12:52 +00:00
Florian HENRY
b80bd8d1f8 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:03:15 +01:00
Florian HENRY
7a93c11ae0 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:01:33 +01:00
Stephane Lesage
5e4cc7fcfd companycard-directedit-typent 2020-12-14 10:14:31 +01:00
Laurent Destailleur
cfa194436f Debug v13 2020-12-11 00:55:21 +01:00
Laurent Destailleur
eedaca1476 Fix bad encoding of link 2020-12-10 00:43:51 +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
f06d920460 FIX #15583 2020-12-03 16:22:03 +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
1c4c1dc74b Merge pull request #15594 from OPEN-DSI/new-societe-list-address 
NEW address column in company list
 2020-12-01 11:31:30 +01:00
lvessiller
20aa1e29f6 NEW address column in company list 2020-12-01 09:58:55 +01:00
UT from dolibit
7b02aa4c38 Update checkVatService.xml 
http -> https at
 <wsdlsoap:address location="https://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
 2020-12-01 09:28:24 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
99e4aab46e CSS 2020-11-30 20:31:22 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +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
Laurent Destailleur
df09fc0d0c Merge pull request #15482 from ptibogxiv/patch-392 
Fix contact API
 2020-11-24 09:08:10 +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