Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-24 01:33:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
64,295 Commits 38 Branches 191 Tags
b063c19084eef006356f2e9c276aef03eee118d3
Commit Graph

53 Commits

Author SHA1 Message Date
Laurent Destailleur
fe57cf697f Fix init category selected 2018-02-04 14:35:38 +01:00
Laurent Destailleur
14ecdce650 Fix merge of thirdparties (pb when merging codes and error management) 2018-01-31 18:01:56 +01:00
Laurent Destailleur
a11cb8dcbf Update card.php 2018-01-11 01:06:50 +01:00
Regis Houssin
8c3b4f62db Fix: wrong entity with thirdparty sharing 2018-01-10 13:30:57 +01:00
Regis Houssin
4cc0e889c1 Fix: restore broken feature 2018-01-10 12:38:27 +01:00
Laurent Destailleur
f22e7ee24a Fixes 2017-12-09 17:29:19 +01:00
Laurent Destailleur
46b281f703 Fix for #7697 2017-12-01 19:29:29 +01:00
Laurent Destailleur
9508c3e0b9 Fix trigger was not called 2017-11-29 16:34:44 +01:00
Laurent Destailleur
4245ad6e2a Return error messages 2017-11-29 16:26:19 +01:00
Laurent Destailleur
2693e5db6d Fix the trigger COMPANY_MODIFY provide information of thirdparty merged 2017-11-29 16:24:58 +01:00
Laurent Destailleur
a0406bc741 Standardize view of events for products 2017-11-26 20:24:20 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Maxime Kohlhaas
73d3cc7ce3 New : merge categories while merging thirdparties 2017-11-03 15:23:18 +01:00
Laurent Destailleur
e4645cf2c5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/blockedlog/class/blockedlog.class.php
	htdocs/contrat/card.php
	htdocs/societe/card.php
 2017-10-27 02:12:35 +02:00
Laurent Destailleur
82231b77a2 Fix data for supplier must be not visible if supplier module off 2017-10-27 01:46:54 +02:00
Laurent Destailleur
f24204c79a Error management after extrafield update 2017-10-24 19:04:40 +02:00
Laurent Destailleur
0e397b3e81 Work on website module 2017-10-20 18:44:03 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
 2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
3e0ccd6312 FIX #7585 2017-10-09 10:43:19 +02:00
Laurent Destailleur
85606126a9 Standardize code for events 2017-10-04 12:58:13 +02:00
Laurent Destailleur
3ddd5d3d3a The default value feature is sensitive to url parameters. 2017-10-01 14:54:17 +02:00
Laurent Destailleur
2c1f1ec651 Try to fix autocomplete 2017-09-30 20:31:20 +02:00
Laurent Destailleur
47c0231fb8 Fix error management 2017-09-30 19:12:12 +02:00
Laurent Destailleur
9ba8b9bf7e Fix stay on create form if creation fails 2017-09-30 18:19:20 +02:00
Laurent Destailleur
fdc1aa2a03 NEW Move contacts of a thirdparty on tab Contacts/Addresses 2017-09-27 19:56:03 +02:00
Laurent Destailleur
d7dd6ed334 Fix undefined var 2017-09-26 16:15:22 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
961d475a9d More complete substitution system. 
Add __CONTRACT_NEXT_EXPIRATION_DATE__  and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
 2017-09-16 03:45:29 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
71ce82b6b9 NEW Better autoselect customer or supplier fields to save clicks 2017-09-12 16:51:10 +02:00
Laurent Destailleur
7d42a58230 Fix no more fk_soc in this table 2017-09-11 12:46:01 +02:00
Laurent Destailleur
e7abb39ee2 NEW Template invoices are visible on the customer tab 2017-09-10 19:28:20 +02:00
Laurent Destailleur
14f41493bb NEW Show country and vat number into company tooltip 2017-09-03 20:49:36 +02:00
Laurent Destailleur
75b8462c03 Fix error output 2017-09-03 17:47:45 +02:00
Laurent Destailleur
75e639db6c Fix error management 2017-09-02 15:23:53 +02:00
Laurent Destailleur
a6a5602572 NEW Can set email of thirdparty as unique and/or mandatory 2017-09-02 12:36:53 +02:00
Laurent Destailleur
bf1f60b31e Merge 2017-08-23 17:14:29 +02:00
Laurent Destailleur
7ae52d843c Look and feel v6 2017-07-01 14:23:24 +02:00
Laurent Destailleur
07b676792a Fix do not show localtax info if not used. 2017-06-16 01:02:53 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
3e51d2f537 Fix backto link after creating a third party 2017-06-08 11:51:31 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
philippe grand
a0b4f8b004 FIX : bug #6943 2017-06-04 12:09:54 +02:00
Laurent Destailleur
2da50f1eca Look and feel v6 2017-05-23 01:32:19 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00