lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,474 Commits 43 Branches 150 Tags 886 MiB
3.8.2
Commit Graph

1224 Commits

Author SHA1 Message Date
Maxime Kohlhaas
ef2337a338 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 
Conflicts:
	htdocs/compta/facture/list.php
 2015-10-22 14:41:58 +02:00
Frédéric FRANCE
5237a2afc7 Fix lost searchstatus on next page list 2015-10-20 17:45:24 +02:00
Maxime Kohlhaas
d79fb71987 FIX : search_status not used in mergefusiontool 2015-10-19 16:17:47 +02:00
Maxime Kohlhaas
5fb6705b5c FIX : Search status not saved into list 2015-10-19 15:53:13 +02:00
Laurent Destailleur
420bfd8301 FIX Preview pages was not using correct style for ref 2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39 FIX The preview of PDF was never refreshed if PDF document was changed 2015-10-18 18:54:54 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
 2015-10-10 18:56:28 +02:00
Laurent Destailleur
1f742c7464 FIX Add a test to save life when ref of object (invoice ref, order ref, 
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
 2015-10-06 16:38:27 +02:00
Laurent Destailleur
e3f225e038 FIX bad link into project box 2015-10-05 19:41:41 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/security.lib.php
 2015-10-01 11:10:47 +02:00
Laurent Destailleur
72c31c0fa9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-10-01 10:48:28 +02:00
Laurent Destailleur
4da8fb901b Add comment 2015-10-01 10:48:09 +02:00
arnaud
0b7305d21a FIX facturestat bad sql when customer view is limited 2015-09-28 16:55:34 +02:00
Laurent Destailleur
fa9103fc97 FIX Bad title line in project view when using jmobile 2015-09-27 16:50:47 +02:00
BENKE Charlie
8dcd6158e3 3.8 bad filtering caused by statut filter #3580 
correction ported on 3.8 too, sorry for the bad step process
 2015-09-26 10:15:42 +02:00
Laurent Destailleur
36632593c0 Fix SQL injections #3300 2015-09-12 11:36:19 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +02:00
Juanjo Menent
c13d2d202b Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2015-09-08 21:08:59 +02:00
Marcos García de La Fuente
50184babb9 FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask 
Close #2893
 2015-09-03 11:55:40 +02:00
Laurent Destailleur
c024578ca1 Fix bad link and remove a break 2015-09-02 19:41:54 +02:00
Laurent Destailleur
e3af0b90ec Fix hidden feature to send remind by email 2015-09-02 18:09:29 +02:00
Laurent Destailleur
df3f29ee96 Fix hidden feature to send remind by email 2015-09-02 16:26:56 +02:00
Laurent Destailleur
c4fa4fc931 Fix hidden feature to send remind by email 2015-09-02 16:25:21 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
aaba18bd51 Fix filter on date 2015-08-24 15:40:33 +02:00
Laurent Destailleur
241bf85da2 Fix parameter sendmassremind 2015-08-18 09:53:04 +02:00
Laurent Destailleur
fc8a822f1d Merge remote-tracking branch 'origin/3.7' into develop 2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:18:02 +02:00
Laurent Destailleur
4b51fc80a6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2015-08-13 00:06:27 +02:00
Laurent Destailleur
b5730a24bc Fix W3C 2015-08-12 22:28:30 +02:00
Marcos García de La Fuente
7cb564586e Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything 
Close #3310
 2015-08-09 13:52:02 +02:00
Maxime Kohlhaas
0afd27e3c2 New : % of evolution on stats 2015-08-07 13:29:11 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Marcos García de La Fuente
d0b1652efd Merge branch '3.5' into bug-3206 
Conflicts:
	ChangeLog
 2015-07-19 11:16:10 +02:00
Marcos García de La Fuente
4649cf7210 Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information 
Close #3206
 2015-07-18 19:40:48 +02:00
Marcos García de La Fuente
7185cfeb84 Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names 2015-07-18 14:48:59 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
45d27ae250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:50:57 +02:00
Laurent Destailleur
e9b6a6a61e NEW Add filter on status on invoice list 2015-07-04 10:50:41 +02:00
Laurent Destailleur
56560d9379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:49:01 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
196a745086 NEW Can filter proposal, orders or invoices with criteria "contain at 
least one product with following tag"
 2015-07-02 22:07:13 +02:00