Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 02:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,866 Commits 36 Branches 190 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

1169 Commits

Author SHA1 Message Date
BENKE Charles
ed67173734 Update modFournisseur.class.php 
Add filter feature on the commande export
 2013-05-24 16:17:36 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Maxime Kohlhaas
57212d7db8 Add mobile phone in contact export 2013-05-17 17:29:41 +02:00
fhenry
faa2399b80 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog

Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
 2013-05-17 09:49:06 +02:00
Laurent Destailleur
b17fe9fc00 New: Export support now autosize of column for excel export. 
Fix: Bad charset when using script export-bank-receipts.
 2013-05-15 13:37:31 +02:00
Laurent Destailleur
f6dfcb756c Text cells must be left align into excel 2007 export. 2013-05-14 23:54:22 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
fhenry
f98442d700 Remove the option into admin screen 2013-05-14 09:24:05 +02:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Regis Houssin
8836b30a02 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:51 +02:00
Regis Houssin
6ec81375c4 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:11 +02:00
Laurent Destailleur
8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-05-07 13:08:30 +02:00
simnandez
15ede98fe7 New: [ task #877 ] Reorganize menus. Init works 
Add migration script 3.4 to 3.5
 2013-05-04 01:22:09 +02:00
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +02:00
Laurent Destailleur
880daa4375 Fix: log file permission during install 2013-05-03 11:51:26 +02:00
Laurent Destailleur
c17cd04686 Merge pull request #904 from defrance69/patch-5 
Update modSociete.class.php
 2013-05-03 01:09:37 -07:00
Laurent Destailleur
776655d8c6 Merge pull request #903 from defrance69/patch-4 
Update modProduct.class.php
 2013-05-03 01:09:29 -07:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Laurent Destailleur
5c95018356 Fix: Avoid empty arrays 2013-05-01 16:00:06 +02:00
Laurent Destailleur
0a71c84bf4 Fix: Remove separator files. 2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
BENKE Charles
b1784ff247 Update modSociete.class.php 
add filter feature on extrafields
 2013-04-30 13:15:02 +03:00
BENKE Charles
3f6216e6d0 Update modProduct.class.php 
Add filtering feature on extrafields
 2013-04-30 13:12:54 +03:00
Grand Philippe
c4a064d104 fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired 2013-04-28 19:35:10 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Laurent Destailleur
0a282c018a Merge pull request #886 from jfefe/doc_ods 
Using of MAIN_DOC_USE_TIMING on ODT
 2013-04-26 13:04:08 -07:00
Laurent Destailleur
162cb4ffea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 19:17:51 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
jfefe
8835868749 Implement MAIN_DOC_USE_TIMING into project and order ODT 2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3 Use MAIN_DOC_USE_TIMING on invoices (odt) 2013-04-26 08:48:44 +02:00
jfefe
036e81a089 Use MAIN_DOC_USE_TIMING on proposals (ODT) 2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING) 2013-04-26 08:48:43 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto 
several lines.
 2013-04-25 23:49:24 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
41c8a9aa6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 15:07:03 +02:00
Laurent Destailleur
bca399623f Fix: finish merge 2013-04-24 12:44:36 +02:00
fhenry
bd1b440743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
78a0c7ace2 Fix: log must use the mask defined into setup 2013-04-23 12:00:02 +02:00