Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,675 Commits 36 Branches 190 Tags
e05de2942b51de1c6a07d5df40352f4b45e13ba4
Commit Graph

4214 Commits

Author SHA1 Message Date
florian HENRY
321814fae3 better fix for #5594 2016-08-09 15:17:19 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
florian HENRY
90cb71f341 revert better fix 2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466 better test 2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411 FIX #5594 2016-08-08 13:43:44 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
Laurent Destailleur
e1e8254bcf Fix thumbs are using same extension than original. 2016-08-05 04:31:19 +02:00
Laurent Destailleur
544d5af49b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
7211542e41 Merge pull request #5569 from olsesacl/develop-show-preview-documents 
NEW Preview documents
 2016-08-05 01:13:35 +02:00
Laurent Destailleur
4e483c675e Merge branch 'dev_add_color_on_select_product' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_add_color_on_select_product

Conflicts:
	htdocs/core/class/html.form.class.php
 2016-08-05 00:44:24 +02:00
Laurent Destailleur
26f553a1a8 Fix bad position of test 2016-08-04 12:04:43 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
e0b9496f9e Fix link sometimes fails because of id not defined 2016-08-04 10:44:17 +02:00
florian HENRY
13f33ab9c7 syntax 2016-08-04 09:23:10 +02:00
florian HENRY
a013e84e0e NEW : Add color regarding stock even on ajax autocompleter product 
selector
 2016-08-04 09:21:04 +02:00
Laurent Destailleur
b97223edd7 Fix: link to link to objects not visible 2016-08-03 19:01:51 +02:00
Laurent Destailleur
6ae8d26a89 Fix max width on combo of tasks 2016-08-03 00:04:38 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Sergio Sanchis Climent
5fe0d601da New: Preview documents 2016-08-02 03:35:22 +02:00
Laurent Destailleur
e335ce6f45 Fix bad var declared 2016-08-01 19:54:03 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4 Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
Laurent Destailleur
79222c732d Fix bad var 2016-07-31 02:56:08 +02:00
Laurent Destailleur
d60ac77ad3 NEW The autofill zip/town table option is on by default. 2016-07-30 15:49:39 +02:00
Laurent Destailleur
45e37c82cd FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 16:29:31 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
b3cdb1f163 FIX tag for date rfc in odt substitution 2016-07-29 16:21:28 +02:00
Laurent Destailleur
9ca7f2cb66 Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by 
default).
 2016-07-28 19:02:23 +02:00
Laurent Destailleur
00118610bb A fix to make editinplace working better 2016-07-28 15:29:46 +02:00
Laurent Destailleur
aae2086ada Move notes on dedicated tabs like other elements. 
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
 2016-07-28 13:53:17 +02:00
Regis Houssin
6bf655c882 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/societe/class/societe.class.php

Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
 2016-07-28 09:53:10 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Sergio Sanchis Climent
3b57727542 PHP7 warnings on project module's configuration page 2016-07-26 22:22:55 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +02:00
Marcos García de La Fuente
3029fd0fe1 FIX #5540 getFormMail is not registered as addReplace hook 2016-07-25 13:18:41 +02:00
Marcos García de La Fuente
3ef3a038cf Merge branch '3.9' into bug-5537 2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91 FIX #5537 AJAX project search does not work properly 2016-07-25 11:49:04 +02:00
BENKE Charlie
415bdbe9b5 Update html.formfile.class.php 2016-07-25 11:22:53 +02:00
Laurent Destailleur
08d23b482b NEW Introduce mass action "delete" on sales orders. 2016-07-23 12:17:47 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
93bb929219 Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type 
NEW : Add new password extrafields type
 2016-07-21 14:01:07 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also, 
event company "create" was not tracked by default like others.
 2016-07-21 13:49:10 +02:00
Laurent Destailleur
34d1c0af72 Merge pull request #5321 from frederic34/patch-7 
Fix quotes not required on int
 2016-07-20 19:09:09 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
6fcd9e8dbf Merge pull request #4612 from bafbes/abb-1 
FIX Target object does not need to have all extrafields of source object.
 2016-07-15 17:41:29 +02:00