Commit Graph

1338 Commits

Author SHA1 Message Date
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
Laurent Destailleur
acc7c371cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/vcard.php
	htdocs/core/boxes/box_birthdays.php
	htdocs/core/boxes/box_birthdays_members.php
	htdocs/core/lib/date.lib.php
2020-04-20 16:10:19 +02:00
Laurent Destailleur
b8e68a5ef7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-20 16:06:31 +02:00
gauthier
b72651fdfd FIX : we must export company mail address on contact vcard only if contact email address is empty 2020-04-20 15:59:44 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
96d087c99d Fix clean event report 2020-04-13 02:59:33 +02:00
Laurent Destailleur
d7784887d1 More font awesome picto 2020-04-12 14:58:50 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
add  in default search
2020-04-10 12:12:28 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
cbbd2399c0
Update list.php 2020-04-09 19:50:24 +02:00
Anthony Berton
da1b8f8c44
Update list.php 2020-04-08 08:56:10 +02:00
Laurent Destailleur
5f255a6c14 A new way to navigate between pages in list is available 2020-03-17 03:24:24 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
7907e85f60
Merge pull request #13153 from bb2a/patch-16
MAJ MAIN_FIRST_TO_UPPER LOW first uppercase letter of a lowercase chain
2020-02-21 18:11:45 +01:00
Laurent Destailleur
e73d83767c Fix phpcs 2020-02-20 12:35:48 +01:00
Anthony Berton
298853138a
Update contact.class.php 2020-02-20 12:17:55 +01:00
Laurent Destailleur
f109864670 NEW Add a profil to import contact categories
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82 FIX Type of contact for event does not exists and not supported
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER

Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
a02f5cde92 FIX Type of contact for event does not exists and not supported
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
918e570e7a FIX Picture of contact not visible in tooltip 2020-02-10 12:56:08 +01:00
Laurent Destailleur
cffc56b80b Declaration of property fields of thirdparties 2020-02-08 11:32:38 +01:00
Tobias Sekan
efcd4d0c63 Fix unset gender property in contact class 2020-02-05 12:34:29 +01:00
Tobias Sekan
24c305dc7f
Fix unset gender property in contact class 2020-02-04 09:00:31 +01:00
Laurent Destailleur
d60ce8a2c3 Fix showoncombobox 2020-01-30 20:02:40 +01:00
Laurent Destailleur
ea53e0b44e Fix showoncombobox 2020-01-30 20:00:41 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Frédéric FRANCE
2ebad186b7
doxygen 2020-01-07 10:54:19 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
VESSILLER
e59514600b FIX contact card state address selected after filling address 2019-12-23 12:10:51 +01:00
Laurent Destailleur
ed6d4ae824 Look and feel v11 2019-12-21 14:08:37 +01:00
Laurent Destailleur
be8075881c Clean dead code 2019-12-20 11:15:15 +01:00
Laurent Destailleur
9f86cd8824 Debug v11 2019-12-20 11:14:16 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
stickler-ci
ffde746479 Fixing style errors. 2019-12-12 16:22:07 +00:00
Anthony Berton
21a28e4bb4
Update contact.class.php 2019-12-12 17:20:20 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Norbert Penel
073274072f
FIX #12558 2019-12-01 10:47:25 +01:00