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

3264 Commits

Author SHA1 Message Date
Laurent Destailleur
68d83dd653 Some fix into perf.php page. 2013-07-24 00:34:08 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Maxime Kohlhaas
9e5286bce9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-14 13:27:41 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Maxime Kohlhaas
0d40debeac Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 17:17:43 +02:00
Maxime Kohlhaas
3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 15:55:33 +02:00
Geoffrey
54961036be Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 15:40:10 +02:00
Laurent Destailleur
158a2b8ca8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/.gitignore
 2013-07-11 11:52:32 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Maxime Kohlhaas
cfc999a06d Merge 2013-07-10 15:44:53 +02:00
Maxime Kohlhaas
8f72e16444 Remove duplicate code 2013-07-10 15:34:36 +02:00
simnandez
ca406d0980 Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS 2013-07-10 15:34:16 +02:00
simnandez
50395fc8c4 Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS 2013-07-10 15:32:29 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Laurent Destailleur
a60cc916f6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-07-10 10:34:56 +02:00
Laurent Destailleur
752bc0ccff Work on tool for performance advice. 2013-07-09 18:45:14 +02:00
Laurent Destailleur
f4428c8a8a Fix: Bad link 2013-07-09 15:27:06 +02:00
Laurent Destailleur
0ca4e4ffe8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-09 13:51:27 +02:00
Laurent Destailleur
5706779c8b New: Add a page on performance advice 2013-07-09 13:50:20 +02:00
Laurent Destailleur
c1cb5e9bff Fix geoipmaxmind module 2013-07-09 00:19:58 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +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
529a58cc9d New: Add advice into info help 2013-07-05 12:04:55 +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
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
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
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines 
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
 2013-06-10 16:05:41 +02:00
Laurent Destailleur
c3f5e0c6ee New: Show version of client lib used by mysql drivers 2013-06-07 19:19:11 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
e25651204c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/admin.lib.php
 2013-06-05 18:56:41 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
ebb8f05f09 Subscription to ML can also be done according to member type 2013-06-05 15:53:27 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
Laurent Destailleur
3e1d2c3e63 Qual: Mutualized and uniformize code 2013-06-05 11:21:45 +02:00
Laurent Destailleur
c4f90f8174 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 11:10:25 +02:00
Laurent Destailleur
7aa145ae6a Fix: Previous fix was not complete 2013-06-05 11:09:54 +02:00
Laurent Destailleur
650158dd59 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 10:51:09 +02:00
Laurent Destailleur
f83ab0de70 Fix: ModelDoc Activation bug 2013-06-05 10:49:12 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement 
Fix: Option to fix bug to send email on by default.
 2013-06-03 22:06:28 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Marcos García
7b20757449 Fix: [bug #908] Erreur lors de la configuration du module 2013-06-01 15:51:17 +02:00
Christophe Battarel
4b1ae9e9a9 add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant) 2013-05-21 11:44:11 +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
Grand Philippe
5f714f1403 fix: wrong trad 2013-05-20 14:39:27 +02:00
fhenry
5d73ce4023 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 12:53:11 +02:00
Laurent Destailleur
bab4e1e509 Fix: PHP version was lost 
Fix: split of long text to avoid horizontal scrolls
 2013-05-16 15:15:30 +02:00
Laurent Destailleur
ad5a350073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-16 15:06:13 +02:00
Laurent Destailleur
37fa25c1ab Fix: PHP version was lost 
Fix: split of long text to avoid horizontal scrolls
 2013-05-16 15:02:26 +02:00
Laurent Destailleur
fb92e13650 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-05-15 22:35:41 +02:00
Laurent Destailleur
626362780a Fix: Remove not used constant 2013-05-15 17:30:18 +02:00
Marcos García
e86a742383 Added missing translations 2013-05-08 17:56:32 +02:00
Marcos García
e18eb3a6b3 Added missing translations 2013-05-08 17:20:20 +02:00
Marcos García
edfcfb9bbd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop 
Conflicts:
	htdocs/admin/commande.php
	htdocs/admin/expedition.php
	htdocs/admin/facture.php
	htdocs/admin/fichinter.php
	htdocs/admin/livraison.php
	htdocs/admin/supplier_invoice.php
	htdocs/admin/supplier_order.php
	htdocs/societe/admin/societe.php
 2013-05-08 15:37:41 +02:00
Marcos García
3d5cb4e8de Style improvements in model document selector 2013-05-07 22:48:03 +02:00
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +02:00
Laurent Destailleur
f6c2bd4928 Fix: Uniformize menu conditions 2013-04-28 23:25:28 +02:00
fhenry
c988944f1a PDF admin : Add option to hide num TVA intra into adress of customer 2013-04-26 13:25:51 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
edc84f4168 Fix: Label must be same into combo list than into admin page. 2013-04-25 13:12:57 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
2c4515f40e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 20:00:01 +02:00
Laurent Destailleur
5d74f228d8 Removed version into trigger page (version on trigger is useless since 
trigger depend on module. Only version of module is required).
 2013-04-22 19:59:41 +02:00
Regis Houssin
7f6a87ab35 FIXME regresion if code with not in numeric base 2013-04-22 16:44:25 +02:00
Regis Houssin
f8ddd69ccb FIXME regresion if code with not in numeric base 2013-04-22 16:42:44 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
Laurent Destailleur
f4513d1beb Move option ate better place 2013-04-21 16:01:36 +02:00
Laurent Destailleur
12caa20e38 Merge pull request #850 from atm-maxime/develop 
Carrier conf modification
 2013-04-20 11:42:44 -07:00
Maxime Kohlhaas
cf945f0187 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-20 13:00:33 +02:00
Marcos García
c3c57351d0 Updated copyright 2013-04-20 12:57:50 +02:00
Marcos García
651b1ae7ce Refactor + es_ES translations improvement + minor stetic change 2013-04-20 12:55:31 +02:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00
Marcos García
458b1cdf60 Improved dictionary translations + minor bug fix 2013-04-19 23:33:54 +02:00
Maxime Kohlhaas
bfb05c78cd Change carrier config into dict instead of dedicated conf page 2013-04-19 20:20:10 +02:00
Maxime Kohlhaas
26aba2b609 Add tracking url for carriers in dict 2013-04-19 19:46:49 +02:00
Marcos García
becd40a825 Fixed bug #828: Error when code_region is not a number in llx_c_regions (with postgres) 2013-04-19 15:38:24 +02:00
fhenry
c0c1de7992 [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 08:40:29 +02:00
fhenry
1b044fd9d6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-16 20:07:42 +02:00
Laurent Destailleur
d28316f4a8 Look: Optimize size 2013-04-16 16:33:05 +02:00
fhenry
7e3ca0ce16 Fix bug 
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug#22548
 2013-04-16 16:02:13 +02:00
fhenry
e2156b5df7 Fix bug 
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug
 2013-04-16 16:00:23 +02:00
Marcos García
16afa18e95 Improved and added missing es_ES translations 2013-04-15 00:09:29 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
 2013-04-14 09:40:01 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
fhenry
5d94b0c576 Fix bug : change path of ODT template for commande and propal module 2013-04-10 16:34:06 +02:00
fhenry
38e30836a5 Fix bug with multicompany (SYSLOG_FILE on wrong entity) 2013-04-10 15:08:03 +02:00
Laurent Destailleur
6a519cd88c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-09 23:06:18 +02:00
Laurent Destailleur
a4b56708e9 Better error management 2013-04-09 23:04:59 +02:00
fhenry
2ca18ace30 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-09 21:58:39 +02:00
fhenry
04e933c40f Fix : admin ODT doctemplate path commande/project 2013-04-09 21:58:25 +02:00
Grand Philippe
f4e58d71ed add supplier invoice extrafields and some fixes 2013-04-09 09:38:25 +02:00
Laurent Destailleur
328801f455 Hide upload on smartphones 2013-04-09 01:27:41 +02:00
Laurent Destailleur
bba123c6ef Merge pull request #815 from FHenry/develop 
Fix bug on ODT template path for order and projects
 2013-04-08 14:27:28 -07:00
fhenry
98aaec18a7 Fix [ bug #810 ] Cannot update ODT template path 2013-04-08 18:08:38 +02:00
fhenry
6379b74099 Fix bug on ODT template path for order and projects 2013-04-08 18:02:12 +02:00
Grand Philippe
832fa1fb31 prepair for insert ExtraFields 2013-04-08 17:46:01 +02:00
Grand Philippe
e54056b805 prepair for insert ExtraFields 2013-04-08 17:39:32 +02:00
Grand Philippe
e21e08717e normalize code 2013-04-08 16:06:57 +02:00
Grand Philippe
76929325f1 some fixes for missing names 2013-04-08 12:57:33 +02:00
Grand Philippe
0eef6c7808 some fixes for wrong and missing names 2013-04-08 12:29:49 +02:00
Grand Philippe
79b3907ec9 some fixes for wrong and missing names 2013-04-08 12:18:19 +02:00
fhenry
78571e4458 Merge branch 'develop' into develop_orderextrafield 2013-04-07 15:12:27 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
fhenry
0aba3cfc05 Fix order_supplier and invoice_supplier PDF model name 2013-04-06 13:00:41 +02:00
fhenry
b7137606ee Merge branch 'develop' into develop_orderextrafield 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
 2013-04-06 10:41:29 +02:00
fhenry
dfcb38d13f [ task #793 ] Add extrafield feature into Orders module 2013-04-05 12:43:00 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme. 
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
 2013-04-03 15:20:56 +02:00
Laurent Destailleur
d752a41f05 Add helper 2013-03-31 16:51:49 +02:00
Laurent Destailleur
cc69cf7b76 New: Can defined a clicktodial setup per user 2013-03-31 16:44:24 +02:00
Laurent Destailleur
294a085047 New: ClickToDial setup is easier 2013-03-31 04:03:08 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
3c23a717fd Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/core/lib/files.lib.php
 2013-03-30 14:10:15 +01:00
Laurent Destailleur
8ad801d0b6 Merge pull request #784 from jfefe/extra_error 
Better error management when add/update extrafields
 2013-03-28 11:12:58 -07:00
Laurent Destailleur
3c3c0b456e Fix: _ not allowed into prestashop tags. 2013-03-28 09:59:59 +01:00
jfefe
013eac1147 Better error management when add/update extrafield 
Usage of setEventMessage() function
 2013-03-27 21:24:45 +01:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
Laurent Destailleur
55a9d3abf1 Merge pull request #776 from FHenry/develop 
[ task #770 ] Add ODT document generation for Projects module
 2013-03-25 15:52:30 -07:00
fhenry
b5751ab658 Add copyright 2013-03-25 19:31:17 +01:00
fhenry
9dd4ed9cb8 [ task #770 ] Add ODT document generation for Projects module 2013-03-25 19:28:34 +01:00
Laurent Destailleur
75c15ee9a1 New: Revenue stamps works for invoices 2013-03-25 13:04:03 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Laurent Destailleur
9391d0d2d6 New: SeparatorThousand and SeparatorDecimal accepts ' chars. 2013-03-24 03:12:40 +01:00
fhenry
d84cd86a50 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Merge Cron module
 2013-03-23 20:24:28 +01:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
fhenry
7ce90c7bf1 Fix : Main eMail configuration SMTP password as input type wasn't 
password (password display in clear...)!
 2013-03-23 12:03:47 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
bf912e2c78 Fix: Some bug into supplier pdf invoice setup. 2013-03-19 15:19:31 +01:00
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop 
task #768  &  task #769
 2013-03-18 05:02:38 -07:00
Laurent Destailleur
c4b86bd9dc Merge pull request #755 from grandoc/develop 
normalize
 2013-03-17 10:00:07 -07:00
Grand Philippe
294b4865d1 normalize and simplify code 2013-03-17 16:10:43 +01:00
eldy
1d09e122c0 Some debug with pgsql 2013-03-17 14:28:57 +01:00
Grand Philippe
57d20e28fb normalize and simplify code 2013-03-17 12:56:54 +01:00
Grand Philippe
c44e9d6044 normalize and simplify code 2013-03-17 11:00:38 +01:00
Grand Philippe
88256b7531 normalize 2013-03-17 10:21:44 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Grand Philippe
dc7a57b3f7 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-16 15:26:19 +01:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00
Laurent Destailleur
5ad1cbbfa5 Fix: Filter lost during navigation 2013-03-16 15:04:27 +01:00
eldy
de458fa626 Qual: Move option at better place 2013-03-16 12:22:37 +01:00
fhenry
98cc7b7a2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-16 09:43:57 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +01:00
jfefe
ae180f06a0 Fix : document module option was not saved 2013-03-16 00:53:46 +01:00
Grand Philippe
6fbb00a890 prepair numbering models for supplier invoices 2013-03-15 19:28:26 +01:00
Grand Philippe
8f7c629d9c prepair numbering models for supplier invoices 2013-03-15 17:45:25 +01:00
Laurent Destailleur
b6a30bb748 Merge pull request #742 from grandoc/develop 
change birth instead of naiss
 2013-03-15 04:05:18 -07:00
fhenry
72effa3f25 Fix part of bugs [ bug #766 ] 2013-03-15 09:31:11 +01:00
Laurent Destailleur
4bd7270721 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-15 01:08:32 +01:00
Laurent Destailleur
45a6c20e96 Version of licence 2013-03-14 23:01:48 +01:00
Laurent Destailleur
fbdf438351 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-03-14 17:01:44 +01:00
Laurent Destailleur
8fe233ac9b New: Add info tip 2013-03-14 09:50:02 +01:00
philippe
a71ffc0839 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-03-14 08:22:08 +01:00
Laurent Destailleur
9729e83e66 Fix: Do not use deprecated function 
New: ajax constant on off can be reversed
 2013-03-13 23:05:34 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
8d2d64e9ae No message when not required 2013-03-13 16:22:11 +01:00
Laurent Destailleur
390921512c Move info message on top right 2013-03-12 15:56:47 +01:00
Laurent Destailleur
e1bf659db5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-11 16:49:37 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields 
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
jfefe
1690c77aa2 Merge branch 'extra_invoice' into extrafields 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-07 01:48:27 +01:00
Laurent Destailleur
d92fd0eaed New: Add table, dictionnary and option to enable "revenue stamp". 2013-03-06 16:09:00 +01:00
jfefe
88a042ec41 Prepare invoice admin page to add extrafield support 2013-03-06 03:36:43 +01:00
jfefe
7d3c35fb90 Merge branch 'extra_propal' into extrafields 2013-03-06 01:41:47 +01:00
Laurent Destailleur
9bced140e6 More explanation onto the php session parameter. 2013-03-06 00:45:43 +01:00
jfefe
f335c4f306 New : add extrafield support on propal object 2013-03-04 18:22:25 +01:00
fhenry
c29602382d Taking account remark on pull request da17302 2013-03-04 16:59:39 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to 
display
 2013-03-04 11:16:46 +01:00
Laurent Destailleur
562ea22304 Qual: Better error management 2013-03-01 18:10:19 +01:00
Laurent Destailleur
f2371be191 Fix: Update button does not appear 2013-02-27 15:24:08 +01:00
Laurent Destailleur
f294ea5fb0 Fix: Update button does not appear 2013-02-27 15:23:25 +01:00
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Laurent Destailleur
283aeb2945 Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because 
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
 2013-02-27 01:06:08 +01:00
Laurent Destailleur
029dec126d Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because 
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
 2013-02-27 01:05:16 +01:00
Laurent Destailleur
402fe2e417 Merge remote-tracking branch 'origin/3.3' into develop 2013-02-26 20:05:23 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847 english language standardization 2013-02-25 09:17:38 +01:00
Grand Philippe
d27568d3d0 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 08:16:43 +01:00
Laurent Destailleur
b4329cb5d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 18:22:57 +01:00
Laurent Destailleur
fe4ef69360 Fix: Duplicate form 2013-02-24 18:08:52 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Laurent Destailleur
4dbf5a20ad Merge pull request #687 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 07:38:55 -08:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 03:11:52 -08:00
frederic34
c8872d7e98 WIP : Admin for carriers 2013-02-23 10:20:31 +01:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Laurent Destailleur
1224e79ee3 Qual: Start to clean how menu managers works. 2013-02-22 19:16:03 +01:00
Grand Philippe
a582fd3f15 english standardization 2013-02-22 16:14:52 +01:00
Grand Philippe
fc4ad12a72 english standardization 2013-02-22 15:57:30 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
frederic34
67c06225a5 WIP : Admin for carriers 2013-02-22 14:18:51 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
frederic34
d26024d8fc WIP : Admin for Carriers (Activate/Desactivate) 2013-02-21 23:40:25 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
320b4bde1f Qual: Code to output tree is now generic 2013-02-20 19:01:29 +01:00
Laurent Destailleur
6db881c09d New: Add link collapse all - expand all. 
Fix: Add missing images.
 2013-02-20 18:34:54 +01:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
Laurent Destailleur
95098a9b59 Fix: Menu editor 2013-02-19 15:23:25 +01:00
fhenry
ebf002d79e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-14 14:59:24 +01:00
fhenry
2af7fd858e Task 714 2013-02-14 14:57:37 +01:00
Laurent Destailleur
031bc911ea Fix: Mass save or update of const fails. 2013-02-13 16:47:25 +01:00
Laurent Destailleur
f869004b95 Fix: Mass save or update of const fails. 2013-02-13 16:46:28 +01:00
Laurent Destailleur
1e74ac24ab Move message at bottom. 2013-02-01 17:34:19 +01:00
Laurent Destailleur
c42a0c5b03 Fix: removed warning 2013-01-28 14:40:15 +01:00
Laurent Destailleur
64cac3194c Fix: Use translation of NPR 2013-01-25 19:19:41 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
c2d334624b Qual: Simplify system for menu manager. Only one file, one class per 
manager.
 2013-01-25 17:44:23 +01:00
Regis Houssin
92849ae039 Fix: $modules not loaded 2013-01-21 18:20:14 +01:00
Laurent Destailleur
05bd489b82 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/admin/index.php
 2013-01-21 01:12:19 +01:00
eldy
b3dbbe94e9 Missing div warning 
Conflicts:
	htdocs/admin/index.php
 2013-01-20 16:21:52 +01:00
eldy
5fe1f38666 Missing div warning 2013-01-20 15:37:33 +01:00
Laurent Destailleur
2f3ed04023 Add info if session are encrypted 2013-01-19 17:56:26 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
abafd4f4ff Fix: separator was working only once. 2013-01-18 11:05:18 +01:00
Laurent Destailleur
6091f74b13 New: First changes to simplify/optimize menu management. 2013-01-17 18:39:15 +01:00
Laurent Destailleur
db54f5af44 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 18:02:51 +01:00
Laurent Destailleur
9d5b36b27b Fix: error set on non object 2013-01-17 17:54:08 +01:00
Laurent Destailleur
533f162e3e Fix: var not defined 2013-01-16 17:09:46 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
1e9cb6b1d4 Qual: A translation file must not be loaded into class constructors, but 
at output level.
 2013-01-15 17:06:53 +01:00
Laurent Destailleur
7075ae2daa Fix: Showing warning 2013-01-15 16:08:16 +01:00
Laurent Destailleur
6a51db82e9 Qual: We can enable box by default because a warning is output to user. 2013-01-15 15:53:35 +01:00
Laurent Destailleur
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
11bb3d0137 Fix: Several fixes into boxes management: boxes was loaded twice, logs 
were wrong, global conf missing.
 2013-01-15 11:35:10 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
6942700ce7 New: Direct jump to edit page 2013-01-14 15:18:15 +01:00
Laurent Destailleur
63cd0e8984 First try to include svg into css. 2013-01-10 18:50:07 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Laurent Destailleur
049a6dc742 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-31 14:00:38 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00
Marcos García
674034e648 Translated some strings in the code 2012-12-31 05:55:06 +01:00