Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,188 Commits 36 Branches 189 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

2851 Commits

Author SHA1 Message Date
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00
Laurent Destailleur
f1bb69eecf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:03 +02:00
Laurent Destailleur
a4c3a4588d FIX link "back to list" was not visible. 2016-09-18 14:12:49 +02:00
Maxime Kohlhaas
5840ed8258 No ORDER BY needed for a COUNT sql, causes PGSQL error 2016-09-15 12:08:47 +02:00
Laurent Destailleur
d6ea6d1725 Fix deprecated option should be on 2016-09-12 02:30:21 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
08dc7ade3b Fix list of supplier price must show price compared to quantity. 2016-09-11 14:04:03 +02:00
Laurent Destailleur
9709c8bbbf FIX inversion customer/supplier price 2016-09-11 13:48:45 +02:00
Juanjo Menent
d8f50f9acd Merge remote-tracking branch 'upstream/3.9' into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-09 16:34:02 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Juanjo Menent
e3c2299c67 Merge remote-tracking branch 'upstream/3.8' into 3.9 
Conflicts:
	htdocs/admin/dict.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-08 18:52:44 +02:00
Philippe
972a2db3a3 No initialisation of the array before filling it. May cause some trouble when fetch is call several times and lines added or deleted 2016-09-08 11:40:39 +02:00
aspangaro
2b43eb934f Fix: Problem of presentation with index supplier command 2016-09-07 22:25:37 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
660fcacef2 Merge pull request #5619 from fappels/4.0_fix_sql_error_insert_supplier_order_line 
Fix SQL error insert supplier order line
 2016-08-17 16:10:38 +02:00
Laurent Destailleur
33ceb5d626 Merge pull request #5601 from aspangaro/4.0-p37 
Uniformize title presentation on product/service card
 2016-08-17 15:50:42 +02:00
fappels
b6f9aa4592 Fix SQL error insert supplier order line 
$this->fk_multicurrency not set gives SQL error
 2016-08-11 21:10:56 +02:00
florian HENRY
5bb3b5c074 FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return '' 2016-08-10 09:47:25 +02:00
aspangaro
a1d1396919 Uniformize presentation 2016-08-10 07:40:40 +02:00
aspangaro
dd905debb4 Uniformize presentation 2016-08-09 10:19:42 +02:00
Laurent Destailleur
bdf779dfd2 Merge pull request #5578 from aspangaro/4.0-p37 
Uniformize presentation
 2016-08-05 00:32:49 +02:00
Laurent Destailleur
caa987fb61 Clean obsolete comment 2016-08-04 10:13:27 +02:00
aspangaro
27603b966e Uniformize presentation on supplier order 2016-08-03 08:25:35 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
3ea7a1fcab Fix strict mode 2016-08-02 17:36:24 +02:00
aspangaro
4a0eb496fa Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36 
Conflicts:
	htdocs/societe/rib.php
 2016-08-01 07:27:49 +02:00
aspangaro
4ee4de4a00 Uniformize presentation supplier invoice 2016-08-01 07:21:24 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Laurent Destailleur
27243069cb FIX #5535 bad dependency. 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 15:19:04 +02:00
Laurent Destailleur
463a130a60 FIX #5457 2016-07-28 11:53:06 +02:00
Laurent Destailleur
490336b2e8 Fix bad dependency. 2016-07-12 20:07:53 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
 2016-07-12 19:30:01 +02:00
Laurent Destailleur
dc138e20e7 FIX: Can't edit label 2016-07-12 10:58:32 +02:00
Laurent Destailleur
0f23cef46c Fix warning of the repair tool. 2016-07-08 18:59:36 +02:00
Laurent Destailleur
9192587ef2 Fix duplicate records 2016-07-07 16:57:57 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
fmarcet
50c5efc374 Fix: Don't load extrafields on orderstoinvoice 2016-07-05 16:41:46 +02:00
Laurent Destailleur
6a903b17e6 Merge pull request #5440 from frederic34/patch-8 
FIX Search on billed
 2016-07-02 20:30:51 +02:00
Frédéric FRANCE
0639bafa6b Update list.php 2016-07-02 10:19:38 +02:00
arnaud
cf5de9d0c8 FIX form_confirm to delete payment on supplier invoice 2016-07-01 16:59:03 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
Laurent Destailleur
c9300bae35 Merge pull request #5415 from fmarcet/3.8 
Fix: Incorrect document link on supplier invoices's list
 2016-06-30 22:31:18 +02:00
arnaud
38dcb0de49 FIX #4455 2016-06-30 16:53:24 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00
Laurent Destailleur
f7427e7366 Fix css 2016-06-29 18:15:35 +02:00
Laurent Destailleur
9b1caefbf9 Fix bad var 2016-06-28 02:40:42 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00