lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,031 Commits 43 Branches 150 Tags 886 MiB
126c72ca24
Commit Graph

32797 Commits

Author SHA1 Message Date
Florian Henry
b1b68eafe3 [ bug #972 ] Auto completion contact field do not take account the min 
caract number before search
 2013-07-08 12:47:07 +02:00
Laurent Destailleur
b26250c45a Fix when alt path is full url instead of relative. 2013-07-07 23:37:56 +02:00
Laurent Destailleur
8f71e5fda2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2013-07-07 23:25:03 +02:00
Laurent Destailleur
05461c47cc Fix: vat rate for slovenia 2013-07-07 23:22:00 +02:00
Laurent Destailleur
0de1fe893a Prepare 3.4 2013-07-07 13:30:30 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
cbc0570bc3 Update exemple 2013-07-07 03:33:10 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
9be6dd8b17 Fix: Missing load 2013-07-05 23:10:47 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Laurent Destailleur
1252820481 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-05 21:18:00 +02:00
Laurent Destailleur
e7982120df Fix bug with php 5.2.4 2013-07-05 21:17:35 +02:00
Laurent Destailleur
879cfbbdf3 Merge pull request #1080 from defrance69/patch-4 
Update modFacture.class.php
 2013-07-05 05:59:19 -07:00
Laurent Destailleur
2cdf621b75 New: Provide relativepath as parameter 2013-07-05 14:55:24 +02:00
BENKE Charles
45e32ca3a5 Update modFacture.class.php 
add 'accountancy_code_sell' to the customer invoice export list
 2013-07-05 12:14:27 +02:00
Laurent Destailleur
529a58cc9d New: Add advice into info help 2013-07-05 12:04:55 +02:00
Florian Henry
1e089ef74a Reset demo webservice to NORUN 2013-07-05 09:19:56 +02:00
Laurent Destailleur
7cb8809669 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-04 00:12:23 +02:00
Laurent Destailleur
eef039e02f New: [ task #286 ] Enhance rounding function of prices to allow round of 
sum instead of sum of rounding
 2013-07-04 00:11:40 +02:00
simnandez
c474929caa Trad: Load contracts lang for stats panel 2013-07-03 16:51:06 +02:00
simnandez
df26037e9d Trad: Load contracts lang for stats panel 2013-07-03 16:49:54 +02:00
simnandez
66ce0582a1 Trad: Fix missing = into es_ES admin.lang 2013-07-03 16:42:53 +02:00
Regis Houssin
7e70d935b6 Fix: change for use url of image 2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb Fix: change for use url of image 2013-07-03 16:06:42 +02:00
BENKE Charles
94772dbe30 Update fiche.php 
change restricted area, too much agressive
 2013-07-03 15:25:22 +02:00
simnandez
6180b6c0a6 Fix: Amarok Tab visu. 2013-07-03 12:16:32 +02:00
simnandez
64a04ef150 Trad: Add missing trans before 3.4 final release 2013-07-03 12:14:37 +02:00
Laurent Destailleur
33ed654745 New: Upgrade jquery flot library to 0.8.1 2013-07-03 03:40:59 +02:00
Laurent Destailleur
d96719c948 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-02 21:55:41 +02:00
Laurent Destailleur
6f5a918373 New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page. 
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
 2013-07-02 21:53:34 +02:00
simnandez
c9fd070bba Fix: Amarok Tab visu. 2013-07-02 18:53:42 +02:00
Laurent Destailleur
8d7a058a67 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-02 09:59:04 +02:00
Laurent Destailleur
1beb50e870 Fix: State for turkey 2013-07-02 09:58:09 +02:00
Laurent Destailleur
46c3b1eb1f Missing vat rate 2013-07-02 01:26:52 +02:00
Laurent Destailleur
cb68924f34 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
 2013-07-02 01:10:06 +02:00
Laurent Destailleur
443d6d4405 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-01 22:44:53 +02:00
Laurent Destailleur
154daa0657 Fix: css 2013-07-01 21:52:09 +02:00
Raphaël Doursenaud
a4fe6a40bf Fixed missing class include 2013-07-01 17:45:44 +02:00
Cédric Salvador
edc5de4f24 indentation 2013-07-01 15:42:14 +02:00
Cédric Salvador
96cea7b79a add the libname field in the migration script 
Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
 2013-07-01 15:42:14 +02:00
Cédric Salvador
aa4f2ba8fb made it possible to call a function from a library 
Conflicts:
	htdocs/install/mysql/tables/llx_cronjob.sql
	scripts/cron/cron_run_jobs.php
 2013-07-01 15:41:27 +02:00
Laurent Destailleur
65c14e9fd9 Add missing turkish file 2013-07-01 14:48:30 +02:00
Laurent Destailleur
b43ba84adb Update tr_Tr language files 2013-07-01 13:57:36 +02:00
Laurent Destailleur
4d71761359 Merge pull request #1074 from GPCsolutions/develop 
Normalized EOL
 2013-07-01 03:47:49 -07:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
17ed70230e Bad request 2013-07-01 11:45:09 +02:00
Laurent Destailleur
56676c925f Merge remote-tracking branch 'origin/3.4' into develop 2013-07-01 02:10:57 +02:00
Laurent Destailleur
59c97afeed Fix: Bad calculation. Missing global. 2013-07-01 02:10:22 +02:00
Laurent Destailleur
c37527a8a0 Fix: No currency into lists. 2013-07-01 01:59:07 +02:00
Laurent Destailleur
134187ef94 Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:05:39 +02:00
Laurent Destailleur
387c213aea New: Add box for graph of customer orders 2013-06-30 23:01:28 +02:00
Laurent Destailleur
1c80f35080 Fix: Avoid duplicate of old lines 2013-06-30 22:19:36 +02:00
Laurent Destailleur
f12680e7c4 Save page with some test and prototypes. 2013-06-30 22:11:25 +02:00
Laurent Destailleur
606b60b17c Minor fixes into css 2013-06-29 04:01:54 +02:00
Laurent Destailleur
4b00da5fa8 Work on boxes with graph 2013-06-29 02:23:23 +02:00
Laurent Destailleur
d8883dba7f New: Add new graphical boxes (customer invoices per month). 2013-06-28 19:19:18 +02:00
Laurent Destailleur
4f84b1e774 Fix: Bad error management 2013-06-28 17:55:48 +02:00
Laurent Destailleur
1168a43bfe Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-28 17:54:23 +02:00
Laurent Destailleur
ee8f3cbbe5 Fix: css when using checkbox into label 2013-06-28 17:50:10 +02:00
Laurent Destailleur
1afef513b1 Fix: Bad error management 2013-06-28 17:44:34 +02:00
Laurent Destailleur
c276283d9f New: Add errorsToString function 2013-06-28 12:44:17 +02:00
Laurent Destailleur
314d45a9ee Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang
 2013-06-28 00:52:09 +02:00
Laurent Destailleur
dc22b5a50a Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2013-06-28 00:24:13 +02:00
Laurent Destailleur
3f2730a2ad Merge pull request #1072 from jfefe/extra_soc 
Fix : bad element type name for company extrafields into export
 2013-06-27 14:40:30 -07:00
Laurent Destailleur
9dea1e54ef Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-27 18:38:06 +02:00
Laurent Destailleur
1223d7c3d0 Fix: Civility field must be blank if not defined. 2013-06-27 18:37:09 +02:00
Laurent Destailleur
7e74d9890b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-27 17:47:03 +02:00
Laurent Destailleur
c92aa1f6aa New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS 
Fix: create member was missing field import_key
New: Uniformize code
 2013-06-27 17:45:58 +02:00
Florian Henry
469e700895 Fix bug pgsql : add mail directly into mailling 2013-06-27 14:35:41 +02:00
jfefe
b513bd7b84 Fix : bad element type name for company extrafields into export 2013-06-27 14:30:49 +02:00
Laurent Destailleur
c590f6482e New: Can fetch from ref_ext and name 2013-06-27 14:23:56 +02:00
Florian Henry
1580f92b11 Fix bug for PGSQL Migration 3.4->3.5 
Fix bug on create invoice from contract
 2013-06-27 08:09:28 +02:00
Laurent Destailleur
f02fa8a41d Fix: css when using checkbox into label 2013-06-26 17:58:34 +02:00
Laurent Destailleur
b5b07f8a14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-26 16:46:01 +02:00
Laurent Destailleur
696ad07871 LF 2013-06-26 16:45:42 +02:00
Laurent Destailleur
58bdac2dcd Merge pull request #1066 from atm-maxime/develop 
Add search on siren (idprof1)
 2013-06-26 07:41:07 -07:00
Cédric Salvador
117ddbdff2 add columns if active hooks use the formBuilddocLineOptions method 2013-06-26 15:20:42 +02:00
Cédric Salvador
bfedddd95e init hook 2013-06-26 15:20:16 +02:00
Cédric Salvador
df94f3816c add hook to add line options in html.formfile.class.php 2013-06-26 15:19:59 +02:00
Cédric Salvador
59f99c416b CRLF to LF 2013-06-26 15:19:02 +02:00
Laurent Destailleur
9a5b55219a Fix: CSS 2013-06-26 14:40:29 +02:00
Laurent Destailleur
1de8ab3785 Fix: CSS 2013-06-26 14:38:56 +02:00
Laurent Destailleur
5f67142fc1 Start prototype for datatable 2013-06-26 11:58:01 +02:00
Laurent Destailleur
8311b83861 Fix: css 2013-06-26 11:41:18 +02:00
Laurent Destailleur
882d34fa88 Fix: css 2013-06-26 11:40:29 +02:00
Laurent Destailleur
9b235f6879 Fix: Remove space at end of binary files 2013-06-26 02:05:18 +02:00
Laurent Destailleur
b3bdc76da3 Trans: More complete examples 2013-06-26 00:05:00 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	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/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1 Fix: warning not always visible. Depends if addon modules were 
installed. Var should provide a quick fix.
 2013-06-25 21:25:09 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Laurent Destailleur
0ec4b3bcdb Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-25 18:10:55 +02:00
Laurent Destailleur
285ea8da3f More info into log 2013-06-25 15:47:59 +02:00
jfefe
54bf3fd516 Add parameter to force user in dol_check_access_document function 
This required by webservice where global $user is not available
 2013-06-25 15:09:51 +02:00
Laurent Destailleur
c2654fa7e2 Fix: Bad translation. Must use a different string than products 2013-06-25 15:00:10 +02:00
Maxime Kohlhaas
76870622e4 Add turnover report by product / serv 2013-06-25 14:54:29 +02:00
Maxime Kohlhaas
2a67d5230d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-06-25 14:47:08 +02:00
Laurent Destailleur
92306ca242 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-25 14:10:07 +02:00
Laurent Destailleur
2d0a85d6f8 New: Add option to send email when paypal or paybox payment is done. 2013-06-25 13:19:44 +02:00
simnandez
ca190be382 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:21:56 +02:00
Maxime Kohlhaas
b22b604d02 Accountancy code on user object in prevision of the complete accountancy module 2013-06-25 11:14:00 +02:00
simnandez
065b30f0d0 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:12:21 +02:00
Maxime Kohlhaas
109d1a71cb Merge 2013-06-25 11:00:48 +02:00
Maxime Kohlhaas
af5db04824 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-06-25 11:00:30 +02:00
Laurent Destailleur
b5391a0d39 Trans 2013-06-25 09:11:37 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
 2013-06-24 20:02:02 +02:00
Laurent Destailleur
7f3a06127a Fix: Bad regex 2013-06-24 19:55:23 +02:00
Laurent Destailleur
eb07c6b2e7 Fix: Missing left padding 2013-06-24 19:45:29 +02:00
Laurent Destailleur
8d04f5a805 Fix: warning 2013-06-24 19:36:10 +02:00
Laurent Destailleur
cba1d73dd4 Fix: Can autoselect warehouse if only one warehouse 2013-06-24 19:34:56 +02:00
Laurent Destailleur
31f2d8922d Fix: warning 2013-06-24 19:34:02 +02:00
Laurent Destailleur
f8f0b08bfc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-24 18:33:00 +02:00
Laurent Destailleur
a8547b5375 New: Add property hidden into module descriptor to allow to hide a 
module according to some dynamic conditions.
 2013-06-24 18:31:56 +02:00
Regis Houssin
930f6e4850 Fix: avoid error with crlf 2013-06-24 18:04:06 +02:00
Regis Houssin
307ae65924 Fix: crlf to lf for avoid errors with git clone 2013-06-24 17:43:27 +02:00
Regis Houssin
ae67496730 Fix: crlf to lf 2013-06-24 17:41:15 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
ba606bf2e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-24 17:13:58 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13 New: add product price sharing for multicompany 2013-06-24 17:12:41 +02:00
Laurent Destailleur
7778a17a89 Qual: clean code from deprecated vars 2013-06-24 16:41:31 +02:00
Maxime Kohlhaas
ac205aac2d Add search on siren (idprof1) 2013-06-24 10:05:29 +02:00
Maxime Kohlhaas
0d3b7f1a0f merge 2013-06-24 10:01:23 +02:00
Laurent Destailleur
871c3d9d07 Fix: debug module cron 2013-06-23 22:30:33 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test 
this new module and debug it.
 2013-06-23 22:21:21 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
7bfdec7993 Fix: css 2013-06-23 18:53:40 +02:00
Laurent Destailleur
db48acddb4 Fix: css 2013-06-23 18:51:49 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
e1bb3bafb7 Fix: css 2013-06-23 18:01:10 +02:00
Laurent Destailleur
1d2f09688e Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 13:04:00 +02:00
Laurent Destailleur
e5eb5492e9 Fix: W3C 2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6 Fix: Search filter was lost 2013-06-23 13:00:02 +02:00
Laurent Destailleur
f2c268f72c Fix: Missing theme for autofill 2013-06-23 12:43:06 +02:00
Laurent Destailleur
0ab500d3a7 Merge pull request #1063 from grandoc/develop 
standardize code
 2013-06-21 08:10:01 -07:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Laurent Destailleur
253ce19bc1 Fix: Bad position of field 2013-06-21 15:26:46 +02:00
simnandez
ba6b5d27a5 New: TODO il faut incrementer le stock si on supprime une expedition 
validee
 2013-06-20 18:37:23 +02:00
Laurent Destailleur
7e748f26a6 Fix: all forms must react same way with option optimize_small_screen 2013-06-20 16:39:17 +02:00
Laurent Destailleur
a1f9b22210 Fix: Missing icon 2013-06-20 16:21:54 +02:00
Laurent Destailleur
a749e2bfaa Fix: Still working on css debug. bureau2crea and cameleo are too 
bugged. I disable them with jmobile to have things working correctly.

Conflicts:
	htdocs/theme/bureau2crea/style.css.php
 2013-06-20 16:20:31 +02:00
Laurent Destailleur
b477272082 Fix: Still working on css debug. bureau2crea and cameleo are too 
bugged. I disable them with jmobile to have things working correctly.
 2013-06-20 16:13:42 +02:00
Laurent Destailleur
4268ca0de2 Missing space 2013-06-20 09:40:02 +02:00
Laurent Destailleur
66d02240f5 Fix: Missing translation 2013-06-20 09:36:36 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
f987fd2245 Fix: Inconsistency arrays into php function 2013-06-19 23:46:46 +02:00
Laurent Destailleur
7f660302e2 Fix: Inconsistency arrays into php function 2013-06-19 23:46:18 +02:00
Laurent Destailleur
ec2e4c8a8b Fix: parenthesis at wrong place 2013-06-19 22:58:35 +02:00
Laurent Destailleur
c0b4ff3616 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-19 19:54:00 +02:00
Laurent Destailleur
aaad4d3474 Fix: Menu cheque depends on bank module and not invoice. 2013-06-19 19:52:20 +02:00
Laurent Destailleur
9f39671886 Fix: Bad translation 2013-06-19 19:40:19 +02:00
Laurent Destailleur
5667fceba8 Merge pull request #1061 from GPCsolutions/group_concat 
Added group_concat equivalent to PgSQL
 2013-06-19 09:34:38 -07:00
Laurent Destailleur
ad49f965d5 Merge pull request #1060 from FHenry/3.3 
Fix trad holidays module
 2013-06-19 09:34:10 -07:00
Laurent Destailleur
d6d7665e65 Merge pull request #1059 from marcosgdf/translations 
Fixed es_ES translation typo
 2013-06-19 09:34:03 -07:00
Laurent Destailleur
374718f735 Merge pull request #1056 from FHenry/dev_projecthtmlform 
Continue normalizing project html.formprojet.class.php
 2013-06-19 09:32:35 -07:00
Laurent Destailleur
2a014f8c7c Merge pull request #1057 from marcosgdf/develop 
CR Fix
 2013-06-19 09:31:28 -07:00
Laurent Destailleur
6779724dc0 Merge pull request #1055 from FHenry/3.4 
Fix ODT to PDF exec scripts path
 2013-06-19 09:30:11 -07:00
Laurent Destailleur
bcc9b81bab Merge pull request #1052 from PaulPoulain/943 
T943: Put the total of the price at the bottom of the propal list
 2013-06-19 09:29:29 -07:00
Laurent Destailleur
b5f4c45cf0 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-19 18:14:19 +02:00
Laurent Destailleur
09317e2034 Fix: Pb with firstname/lastname and font size 2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779 Fix: Pb with firstname/lastname and font size 2013-06-19 18:08:05 +02:00
Laurent Destailleur
5cb2ba3909 Several fixes in CSS 
Conflicts:
	htdocs/core/menus/standard/empty.php
 2013-06-19 17:02:09 +02:00
Laurent Destailleur
e92e6f7131 Fix: Icon of wrong version 2013-06-19 17:00:11 +02:00
Laurent Destailleur
9bd41e94b5 Fix: Pb in css 2013-06-19 17:00:01 +02:00
Laurent Destailleur
850ee5e195 Several fixes in CSS 2013-06-19 16:59:03 +02:00
Laurent Destailleur
8dd34c194e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-19 16:51:32 +02:00
Laurent Destailleur
8b25a5cbf5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-19 16:48:57 +02:00
Laurent Destailleur
5ee3d67488 Fix: Icon of wrong version 2013-06-19 16:44:04 +02:00
Raphaël Doursenaud
2f8954acb3 Added group_concat equivalent to PgSQL 2013-06-19 15:54:27 +02:00
Laurent Destailleur
51d40b94cc Fix: Pb in css 2013-06-19 15:52:06 +02:00
Florian Henry
035edc12ce Fix [ bug #945 ] error adding a service 2013-06-19 14:41:18 +02:00
Laurent Destailleur
d32b36ce29 Fix: css with jmobile 2013-06-19 14:04:25 +02:00
Laurent Destailleur
dcaaa84ddb Fix: css with jmobile 2013-06-19 14:03:54 +02:00
Florian Henry
835b8e9d7e Fix trad holidays 2013-06-19 11:23:43 +02:00
Florian Henry
ee1e266774 Fix trad holidays module 2013-06-19 11:22:53 +02:00
Marcos García
76d9ba6a43 Fixed es_ES translation typo 2013-06-19 10:24:24 +02:00
Marcos García
676191c1f9 Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 2013-06-19 10:22:46 +02:00
Florian Henry
08e0e8244a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-19 10:07:32 +02:00
Marcos García
4532399026 CR Fix 
I'm getting tired of these commits...
 2013-06-19 09:26:20 +02:00
Laurent Destailleur
965b173451 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:12:35 +02:00
Laurent Destailleur
bd8271ee24 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:11:42 +02:00
Laurent Destailleur
f0aac521d0 Fix: civility label 2013-06-18 23:28:55 +02:00
Laurent Destailleur
66e0f80aa2 Fix: civility label 2013-06-18 23:28:03 +02:00
Laurent Destailleur
8f60d60e8d Fix: Bad return url 2013-06-18 22:12:49 +02:00
Laurent Destailleur
73e3ef3a82 Fix: Bad return url 2013-06-18 22:12:17 +02:00
Laurent Destailleur
c45cd3aa1c Fix: Tab must not always be visible 2013-06-18 21:44:18 +02:00
lalaina rasamoelina
e8f26ad33b T943 If there is only one page, we keep label "Total HT", but if there is more than one page, we use "Total HT for this page" 2013-06-18 10:59:19 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Florian Henry
cac7cbebd4 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-18 09:46:49 +02:00
Florian Henry
dc5db0c137 fix ODT to PDF script path 2013-06-18 09:07:53 +02:00
Laurent Destailleur
e8e710fd0c Fix: Translation 2013-06-17 23:53:03 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough. 
Fix: Var was not initialized.
 2013-06-17 23:24:53 +02:00
Laurent Destailleur
f0c8c1805f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-17 22:11:24 +02:00
Laurent Destailleur
9becf83d70 Keep zapfdingbats. 2013-06-17 22:10:44 +02:00
Florian Henry
83116b5627 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-17 16:23:54 +02:00
Laurent Destailleur
326387ab75 Fix: Missing lang 2013-06-17 15:00:40 +02:00
Laurent Destailleur
8b73b2b4f3 Fix: Solve some problem of redirect when logout 
Conflicts:
	htdocs/user/logout.php
 2013-06-17 14:54:44 +02:00
Laurent Destailleur
ac16127894 Fix: Solve some problem of redirect when logout 2013-06-17 14:47:14 +02:00
Florian Henry
8a6a3fc9f4 Continue normalizing project html.formprojet.class.php 2013-06-17 14:25:33 +02:00
Laurent Destailleur
834a3fd3c5 Qual: Clean code. Removed useless functions and params 2013-06-17 14:12:59 +02:00
Laurent Destailleur
2042fc3a21 Qual: Update jquery.tablednd plugin. Use minified version (all embedded 
plugins should use minified version).
 2013-06-17 13:16:25 +02:00
Florian Henry
7cc7e8392d Fix ODT to PDF exec scripts path 2013-06-17 11:58:59 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +02:00
Laurent Destailleur
7ec8220826 Merge pull request #1054 from marcosgdf/develop 
CR fix
 2013-06-16 15:05:28 -07:00
Laurent Destailleur
9012c49299 Perf: Optimize class loading. Need 1 MB less of memory to load home 
page.
 2013-06-16 23:15:20 +02:00
Marcos García
bf2d61515d CR fix 
Git required me to commit these changes
 2013-06-16 21:33:05 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
c83bce262e Fix: Do not show time if start time was not calculated 2013-06-16 20:22:32 +02:00
Laurent Destailleur
91068a4476 Fix: Pb into form output 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-06-16 20:16:05 +02:00
Laurent Destailleur
0690e8c39e Fix: Pb into form output 2013-06-16 20:08:45 +02:00
Laurent Destailleur
fee958eafb Add comments 2013-06-16 12:23:00 +02:00
Laurent Destailleur
8410ad1933 Fix: CSS 2013-06-16 12:03:27 +02:00
Laurent Destailleur
696a97db4e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-16 12:00:36 +02:00
Laurent Destailleur
b9a1a3e096 Fix: CSS 2013-06-16 12:00:18 +02:00
Laurent Destailleur
b40e2b85ca Merge pull request #1053 from FHenry/dev_projecthtmlform 
Start normalize project module : create html.formprojet.class.php with …  selec_project
 2013-06-15 15:25:57 -07:00
Laurent Destailleur
377f308d08 Merge pull request #1049 from PaulPoulain/935 
T935 put a filter on the author in the propal list
 2013-06-15 15:17:58 -07:00
Laurent Destailleur
2005f0ba81 Merge pull request #1047 from PaulPoulain/929 
929
 2013-06-15 12:55:23 -07:00
Laurent Destailleur
6781d43265 Merge pull request #1046 from marcosgdf/develop 
CR fix
 2013-06-15 12:54:32 -07:00
Florian Henry
f2e2815cc1 Merge branch 'develop' into dev_projecthtmlform 2013-06-15 11:56:45 +02:00
Laurent Destailleur
706b0d562f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-15 01:09:08 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with 
selec_project
 2013-06-14 22:33:01 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-06-14 19:56:07 +02:00
Laurent Destailleur
0a9cf26a32 Fix: Bad closing of div 2013-06-14 19:51:53 +02:00
Laurent Destailleur
af8c4cd0d3 Fix: Bad closing of div 2013-06-14 19:46:43 +02:00
Laurent Destailleur
2f386b1b36 Fix: Bad closing of div 2013-06-14 19:43:45 +02:00
lalaina rasamoelina
feb7af490a T943: Put the total of the priceat the bottom of the propal list 2013-06-14 15:46:11 +02:00
simnandez
684c086ad0 Fix: param must be a string 2013-06-14 15:37:28 +02:00
lalaina rasamoelina
9649e731b8 T935 put a filter on the author in the propal list 2013-06-14 15:05:58 +02:00
lalaina rasamoelina
8139e6e5f0 T929 put the button to remove filter in company list 2013-06-14 14:56:49 +02:00
lalaina rasamoelina
57c4d7212d T929 Printed all the name that have been cut to 30 char 2013-06-14 14:56:04 +02:00
Marcos García
829b3bfc1d CR fix 
GIt required mi to commit this changes
 2013-06-14 12:48:27 +02:00
Laurent Destailleur
3b88142ba8 Fix: Import of extra field for members 2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850 Fix: Export of extra field for members 2013-06-14 02:35:30 +02:00
Laurent Destailleur
bc5fa5972a Drop deprecated tables 2013-06-14 02:26:24 +02:00
Laurent Destailleur
a9edbf4f24 Fix: Bad size of image 2013-06-14 02:25:44 +02:00
Laurent Destailleur
8ed5dfeded Fix: Bad styles of html elements 2013-06-14 02:15:43 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Laurent Destailleur
02f1271fc4 New: Add option ADHERENT_LOGIN_NOT_REQUIRED 2013-06-14 01:30:43 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Laurent Destailleur
c1b21d1480 Fix: Option not working 2013-06-14 01:29:05 +02:00
Laurent Destailleur
396cbcec62 Fix: Do not update twice level 1 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-06-14 01:23:54 +02:00
Laurent Destailleur
99cbee6486 Fix: Do not update twice level 1 2013-06-14 01:22:38 +02:00
Laurent Destailleur
b3e81afae4 Merge pull request #1045 from FHenry/3.4 
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
 2013-06-13 16:05:01 -07:00
Laurent Destailleur
9ff6b4c23e Fix: Too large top 2013-06-14 00:46:02 +02:00