Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,999 Commits 36 Branches 190 Tags
1befd9c67f8ed52be5e11083c051794e09d9430c
Commit Graph

894 Commits

Author SHA1 Message Date
Marcos García de La Fuente
166f2d262d Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume 2017-05-02 14:00:27 +02:00
Laurent Destailleur
1e3384a842 Fix travis 2017-04-30 14:16:58 +02:00
Laurent Destailleur
865c8140d1 Clean code 2017-04-30 03:23:06 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
e6e9b65594 NEW Reduce memory usage by removing deprecated constant loading. 2017-04-14 12:38:52 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php
 2017-04-11 11:43:54 +02:00
altatof
d892a89f45 FIX: dont get empty "Incoterms : - " string if no incoterm 2017-04-07 14:15:51 +02:00
Laurent Destailleur
e2ea5945dd Work on look and feel v6 2017-04-06 21:48:28 +02:00
dolibarr95
1489847a74 Display mobile icon 
Display a specific icon when mobile
 2017-03-30 09:49:34 +02:00
Laurent Destailleur
d951114c18 Merge branch 'develop' into NEW_odt_others_objects 2017-03-14 10:44:05 +01:00
Laurent Destailleur
4bf0e31299 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/loan.lang
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-11 02:40:42 +01:00
Laurent Destailleur
209bd0b3e4 2nd try to fix better compatibility 2017-03-10 16:53:26 +01:00
Laurent Destailleur
c72e7c1057 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2017-03-10 14:54:35 +01:00
arnaud
a796a321cc Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2017-03-10 12:16:55 +01:00
Laurent Destailleur
8389db18bf Fix solution for comaptibility 2017-03-10 10:07:09 +01:00
Laurent Destailleur
92d9eb3c5d Several fix for a better management of #6424 2017-02-22 17:46:54 +01:00
Laurent Destailleur
596c092ec8 Merge pull request #6219 from atm-florian/dev_changelistchild 
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
 2017-02-08 16:49:18 +01:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received 
NEW Develop new reduc on excess received
 2017-02-08 11:16:10 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2017-02-01 20:58:17 +01:00
Laurent Destailleur
756919de2a Fix deadlock feature: could not solve a situation where an emailing was 
validated by error.
 2017-01-29 16:08:45 +01:00
florian HENRY
055a00a338 fix travis 2017-01-27 15:18:12 +01:00
florian HENRY
cb6209de31 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-27 15:16:28 +01:00
Laurent Destailleur
3c86507ce6 FIX #6328 2017-01-27 00:51:22 +01:00
florian HENRY
d714a52f95 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-23 11:35:11 +01:00
Laurent Destailleur
5362d10c0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2017-01-21 21:56:24 +01:00
Laurent Destailleur
b8a80f9311 Fix code comment and missing showLinkToObjectBlock hook declaration as 
an addreplace hook.
 2017-01-21 17:30:35 +01:00
Laurent Destailleur
2566df8252 Merge pull request #6298 from benlo06/fix_shipping_contactid 
FIX getIdContact for shipping
 2017-01-18 15:53:32 +01:00
Benoit
73852beb4e FIX contactid for shipping pdf 2017-01-17 21:55:21 +01:00
Laurent Destailleur
36bd63c1a7 NEW PHP 7.1 compatibility 2017-01-16 09:05:18 +01:00
Laurent Destailleur
6bfd534a36 NEW PHP 7.1 compatibility 2017-01-16 01:21:33 +01:00
Laurent Destailleur
2c6672d17a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2017-01-12 11:32:51 +01:00
Laurent Destailleur
5553be4aa9 Fix code comment 2017-01-11 16:08:04 +01:00
Laurent Destailleur
51b9802de4 NEW Hook to allow inserting custom product head #6001 2017-01-07 20:42:35 +01:00
arnaud
b813144edb NEW generation ODT 2017-01-06 16:44:09 +01:00
Laurent Destailleur
f46ce68d08 NEW Can sort thumbs visible on product card 2016-12-31 16:16:20 +01:00
florian HENRY
337897e0a1 NEW : Allow extrafields list select to be dependands on other standard 
list and not only other extrafields list
 2016-12-23 15:01:49 +01:00
Laurent Destailleur
54aa8696ad Fix regression 2016-12-18 13:01:26 +01:00
Laurent Destailleur
4ece746437 Merge pull request #6168 from defrance/patch-61 
FIX navigation field is always ref
 2016-12-18 11:02:14 +01:00
phf
cca7967144 Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin 2016-12-15 16:19:54 +01:00
phf
21a648a052 Fix user right on margin module to write buyprice 2016-12-15 12:01:46 +01:00
BENKE Charlie
2cebeb72aa FIX navigation field is always ref 2016-12-14 15:04:07 +01:00
Maxime Kohlhaas
f7524b93ad Actualize currency on supplier order and invoice 2016-12-11 02:50:21 +01:00
Maxime Kohlhaas
177ec97689 Actualize currency on propal, order and invoice 2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
7c82b18da0 New : allow to actualize currency rate 2016-12-10 22:07:25 +01:00
Laurent Destailleur
017e384f16 FIX Preselected value for extrafield link was not correctly set 2016-12-06 13:10:44 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
gauthier
9a1309256d Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received 2016-11-28 17:13:09 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
gauthier
c433829d27 NEW : interface 2016-11-25 11:04:42 +01:00