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

6923 Commits

Author SHA1 Message Date
Laurent Destailleur
825640d645 Fix: Missing special code into export 2013-12-08 21:24:59 +01:00
Laurent Destailleur
3c0c9019b5 Comment 2013-12-08 15:40:22 +01:00
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Laurent Destailleur
0e819ab5cd Fix: Missing test 2013-12-07 16:43:35 +01:00
Laurent Destailleur
598a241366 Fix: minor css. 
Fix: Alignement of screenshot was wrong. Wrapping too.
 2013-12-06 10:23:26 +01:00
Laurent Destailleur
4d9712ea4c Merge pull request #1318 from csalvador/develop-fichinterPDF 
Develop fichinter pdf
 2013-12-04 09:41:13 -08:00
Laurent Destailleur
24ce511671 Fix: [ bug #1167 ] Supplier IBAN account number set but no account 
specified warning
 2013-12-04 18:20:58 +01:00
Florian Henry
c2a8967b52 Much better fix for translated product description into PDF 2013-12-03 17:06:19 +01:00
Laurent Destailleur
6c7e173bba Fix: jmobile broken with css tagtable, tagtr and tagtd 2013-12-02 22:31:02 +01:00
Alexis Algoud
bb191021de Add entitytotest test, because a LDAP user can override the entity restriction without this test 2013-12-02 16:04:30 +01:00
Alexis Algoud
38c7c609bc Error on mercure bill's number function. 
Ex draft bill for november :
mask = FC{yy}{mm}{000@99}
{mm} = 11
On validation, number -> FC131160 instead of FC131112
 2013-12-02 11:42:39 +01:00
Florian Henry
3e712c9c8c Finnaly make it works 2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb Avoid strpos bug if string is empty or null 2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e remove useless space 2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28 Better Fix 2013-12-02 10:27:41 +01:00
Florian Henry
c0ef63fd74 Bteer fix 2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e Better test for HTMLentities desc translation 2013-12-02 00:20:50 +01:00
Florian Henry
c6991f97d4 [ bug #1174 ] Product translated description not good into PDF 
Country
 2013-12-01 22:47:22 +01:00
Laurent Destailleur
0b9e8d6832 Fix: Alignement 2013-12-01 19:41:41 +01:00
Laurent Destailleur
e9e94b9e47 Fix: Alignement 2013-12-01 19:39:21 +01:00
Laurent Destailleur
b6386a3dce Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2013-12-01 16:08:03 +01:00
Laurent Destailleur
519919889c Fix comment 2013-11-30 16:57:11 +01:00
Cédric Salvador
22d31817de made getVATRates synchronous to avoid concurrency problems 2013-11-29 12:13:23 +01:00
Laurent Destailleur
e27d109f2d Merge pull request #1328 from csalvador/develop-fixAJAX 
Develop fix ajax
 2013-11-29 02:59:11 -08:00
Grand Philippe
c0650d6da3 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-29 08:30:46 +01:00
Laurent Destailleur
ea51e9ec77 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 18:57:43 +01:00
Laurent Destailleur
d0b05bb5af Fix: Restore style code lost by a commit. 2013-11-28 18:55:36 +01:00
Laurent Destailleur
5715e9c986 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 17:06:11 +01:00
Grand Philippe
5b2f9af7dc fix management of all errors messages 2013-11-28 16:44:57 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Cédric Salvador
ec3fc4e6e6 indentation 2013-11-28 15:53:28 +01:00
Cédric Salvador
2da88a2966 made getVATRates synchronous to avoid concurrency problems 2013-11-28 15:52:26 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a 
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
 2013-11-28 12:58:02 +01:00
Laurent Destailleur
b71406f12d Merge pull request #1322 from aspangaro/develop 
Improvement of the Skype button
 2013-11-26 07:29:37 -08:00
Laurent Destailleur
0383dc4706 Fix: 2 bugs during validation of a member 2013-11-26 13:10:00 +01:00
Laurent Destailleur
854cfc741e Fix: 2 bugs during validation of a member 2013-11-26 13:04:15 +01:00
aspangaro
e1b4d01235 Improvement of the Skype button 
Perm & add a button"Chat"
 2013-11-24 21:28:15 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Laurent Destailleur
73408479ba Merge remote-tracking branch 'origin/3.5' into develop 2013-11-24 13:19:41 +01:00
Laurent Destailleur
aa3c16b6af Fix: chars were lost by function 2013-11-23 16:34:08 +01:00
Laurent Destailleur
8e313ef32d Fix: Can add ban record but was not possible to delete 2013-11-23 16:17:20 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
4b16551f88 Merge pull request #1316 from defrance69/patch-20 
Update modAgenda.class.php
 2013-11-23 05:05:55 -08:00
Laurent Destailleur
a171c40531 Merge pull request #1317 from GPCsolutions/develop-fixaddline 
Made update price synchronous to avoid dependency hell
 2013-11-23 05:03:01 -08:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
Laurent Destailleur
04fdfb4047 Fix: Problem with W3C and wrapping of some title lines. 2013-11-22 11:45:42 +01:00
Cédric Salvador
2b6a5508c7 debug the Soleil model 2013-11-22 09:51:48 +01:00
Cédric Salvador
c73057ead9 show page number 2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076 show signature space on the last page only 2013-11-22 09:51:47 +01:00
Raphaël Doursenaud
302a230bf2 Made update price synchronous to avoid dependency hell 2013-11-21 18:00:27 +01:00
BENKE Charles
1bb7ddc2b1 Update modAgenda.class.php 
export extensions
 2013-11-21 17:32:11 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user 
right allow it is OK
 2013-11-21 12:28:51 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
cb539399a0 Merge pull request #1302 from FHenry/develop 
Fix output of extrafield select list from table
 2013-11-20 14:42:50 -08:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Regis Houssin
4c29bddfda Fix: wrong variable name 
Fix: restore address.class.php, this class is used
 2013-11-20 09:40:56 +01:00
Florian Henry
ed21b573ea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-20 00:46:50 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Laurent Destailleur
4356496ee8 Qual: File is not a class of a module 2013-11-18 00:20:05 +01:00
Laurent Destailleur
6a5b3e2020 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-17 23:26:37 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Florian Henry
a2368daa57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-17 17:07:00 +01:00
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
45aac81b71 Doc: More comments 2013-11-16 18:12:13 +01:00
Laurent Destailleur
8ec50fce23 Move warning at correct place. 
Fix: Reset of amount was not working
 2013-11-16 14:26:42 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Florian Henry
7696730680 Fix output of extrafield select list from table (in case of filter with 
extrafields table)
 2013-11-15 15:44:04 +01:00
Laurent Destailleur
c324f6a9a3 Merge pull request #1295 from FHenry/develop 
Display customer code (according setting) into list
 2013-11-15 05:05:36 -08:00
Laurent Destailleur
b3a1d695cd Qual: Better message for total of buying price 
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
 2013-11-15 11:43:16 +01:00
Laurent Destailleur
2e5320a532 Qual: Clean and uniformize code 2013-11-13 23:35:33 +01:00
Laurent Destailleur
cf3d6d410c Fix: Use correct css 2013-11-13 21:50:16 +01:00
Florian Henry
fe0006c71d Merge from dev 2013-11-13 21:34:02 +01:00
Florian Henry
a8e31ad956 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/company.lib.php

Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a
 2013-11-13 21:33:12 +01:00
Laurent Destailleur
588a30fa80 Fix: Bad status 2013-11-13 21:14:11 +01:00
Laurent Destailleur
5a8f4905d6 Fix: bad link into ecm module 2013-11-13 20:36:07 +01:00
Laurent Destailleur
d57aa65d30 Fix: Add option to fix warning not visible when there is preactivated 
modules
 2013-11-13 18:45:36 +01:00
Florian Henry
652d7db0b4 Get Status from getLibStatus ! 2013-11-13 17:26:29 +01:00
Florian Henry
6d8871b4cf Add filter on show_contact company.lib.php 2013-11-13 17:02:30 +01:00
aspangaro
86a2da31b4 Fix for document cerfa into module Don 2013-11-10 06:52:20 +01:00
aspangaro
6b6855dff5 Fix for document cerfa into module Don 2013-11-10 06:37:08 +01:00
Raphaël Doursenaud
1fc2e495ba Moved unreachable statement 2013-11-08 14:42:28 +01:00
Raphaël Doursenaud
b6eecb0394 Developer documentation fix 2013-11-07 22:14:43 +01:00
Raphaël Doursenaud
9faa832560 Wrong var 2013-11-07 22:11:43 +01:00
Raphaël Doursenaud
8e1fd7a083 PHP doesn't know reals, use float 2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
e514b50d7e Typo fix 2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
c845124b92 Object type is lowercase 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
01ea84a917 Static members are not always strings 
Update method documentation to reflect the mixed type expected
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
d5ab0723ba Timestamp is not a type 
Timestamps are integers so let's document this correctly
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
fa43476890 Fixed methods description 
These methods were declared void but actually returns values. Added proper documentation.
 2013-11-07 21:02:50 +01:00
Laurent Destailleur
cf8ff25d5b Minor enhancement with link feature 2013-11-07 02:56:56 +01:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
4a29431b69 New: Add hidden option MAIN_SECURITY_HASH_ALGO to choose hash function 2013-11-06 16:32:25 +01:00
Raphaël Doursenaud
f11f9b0a69 Added missing copyright 2013-11-06 10:33:29 +01:00
Raphaël Doursenaud
81ecb4b4a5 Updated method call to new prototype 2013-11-06 10:26:09 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
c3108f452c copyrights 2013-11-06 10:20:11 +01:00
Cédric Salvador
039bd5b4c8 checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
b9c36e6e0a checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
4d490ea02b open link in new tab 2013-11-06 10:19:17 +01:00
Cédric Salvador
b34a613504 code formating 2013-11-06 10:19:17 +01:00
Cédric Salvador
f2535d74ea edit link lines function 2013-11-06 10:19:17 +01:00
Cédric Salvador
b158e8bb74 translations 2013-11-06 10:19:17 +01:00
Cédric Salvador
b625b1843e add a field for label input 2013-11-06 10:19:17 +01:00
Cédric Salvador
f19e5e86f4 don't try to create a link when the link input field is empty 2013-11-06 10:19:17 +01:00
Cédric Salvador
ce19b6da5c typo 2013-11-06 10:19:17 +01:00
Cédric Salvador
dcf051605a delete function for links 2013-11-06 10:19:16 +01:00
Cédric Salvador
28bfb10dbd UI 2013-11-06 10:19:16 +01:00
Cédric Salvador
c96b2d3b87 factorized form attach, documents list and links list for the document pages 2013-11-06 10:19:16 +01:00
Cédric Salvador
3529f5238b display links 2013-11-06 10:17:18 +01:00
Cédric Salvador
e8e3752626 link creation in dol_add_file_process 2013-11-06 10:17:17 +01:00
Cédric Salvador
d47bb95b56 bugfix 2013-11-06 10:11:40 +01:00
Cédric Salvador
3f774adbd0 form to link a file 2013-11-06 10:11:40 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Laurent Destailleur
27b33cafe6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-05 19:54:58 +01:00
Laurent Destailleur
addedb6f15 Merge branch 'develop' of https://github.com/FHenry/dolibarr into 
FHenry-develop

Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-11-05 19:53:49 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Laurent Destailleur
a9a2bd9eec Fix error reported by travis. 2013-11-05 14:39:25 +01:00
Laurent Destailleur
b18e125143 Merge pull request #1279 from aspangaro/skype 
Task 157 : add a Skype button
 2013-11-05 05:33:33 -08:00
Laurent Destailleur
223e50276c Fix: Info tab was wrong with interventions 2013-11-05 14:24:37 +01:00
Laurent Destailleur
190dabc3f7 Fix: Tons of bugs with extrafields feature. 2013-11-05 13:11:36 +01:00
Florian Henry
0d2a019c3f Extrafield : better filter on select from table management for 
extrafields table
 2013-11-05 11:26:13 +01:00
Laurent Destailleur
922929fffb Fix: Missing column 
Fix: Line was not added correctly
Fix: Missing message
 2013-11-05 11:17:54 +01:00
aspangaro
76263213ab Merge branch 'origin/develop' 2013-11-04 22:04:36 +01:00
aspangaro
8fd021bf36 Merge branch 'upstream/develop' 2013-11-04 21:44:58 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Florian Henry
35c0695513 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-04 19:21:26 +01:00
Florian Henry
a57afb6d40 [ task #1127 ] Add feature filter on extrafield type : select for table 2013-11-04 19:21:13 +01:00
Laurent Destailleur
c815bd96fb Doxygen 2013-11-04 16:50:41 +01:00
Laurent Destailleur
fd168c1214 Doc comments 2013-11-04 15:04:04 +01:00
Laurent Destailleur
f1c398f93c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-04 10:57:04 +01:00
Laurent Destailleur
32983b79ee Sec: Add option to salt password 2013-11-04 10:47:24 +01:00
Laurent Destailleur
e5fd19ffc0 Add option to salt hash passwords 2013-11-04 10:45:43 +01:00
Laurent Destailleur
469dd03673 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/changelog
	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/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
 2013-11-01 17:58:38 +01:00
Laurent Destailleur
f8e3a3e38a Fix: Sub level of dir must not always be visible. So I added parameter 
"showrelpart". Default value is old behaviour (only filenmae is
visible).
 2013-11-01 17:36:22 +01:00
Laurent Destailleur
44a78ca884 Merge pull request #1262 from defrance69/patch-17 
Update html.formfile.class.php
 2013-10-31 04:49:01 -07:00
Laurent Destailleur
154a75cc39 Merge pull request #1268 from FHenry/develop 
Add NL_nl translation for category contact
 2013-10-31 04:38:52 -07:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
c51ff1d462 New: Add hidden option to disable log handlers. 2013-10-30 19:08:41 +01:00
Christophe Battarel
ba0273ccc4 fix bad rounding on margin calculation and display 2013-10-30 18:17:37 +01:00
Florian Henry
f512ef344a Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE 
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
 2013-10-30 12:24:51 +01:00
Laurent Destailleur
b3a0510407 Fix: Allow text input for hour. 2013-10-30 11:57:32 +01:00
Laurent Destailleur
5b3ba85669 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-10-29 18:07:12 +01:00
Laurent Destailleur
70342c09b8 Fix: Better management of using ajax for upload form (to solve problem 
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
 2013-10-29 17:52:13 +01:00
Laurent Destailleur
953f638cb4 New: Sort combo list for type of thirdparties. 2013-10-28 02:13:07 +01:00
Laurent Destailleur
93c5720579 New: Add path to installed dir of external modules + Name and web of 
module provider.
 2013-10-28 01:37:04 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
 2013-10-27 02:33:03 +02:00
Laurent Destailleur
197ae822d4 Merge pull request #1263 from FHenry/develop 
Fix list propal and invoice to display customer ref if option is set
 2013-10-26 17:13:07 -07:00
Laurent Destailleur
62bedffb49 Fix: Bad class for body 2013-10-27 02:10:53 +02:00
Laurent Destailleur
f67537799b Fix: Wrong usage of new preoutput confirm box 2013-10-26 18:46:07 +02:00
Laurent Destailleur
966f135316 Fix: Migration must load new boxes 2013-10-26 16:18:28 +02:00
Florian Henry
c2def3d0b6 Fix bad display IE for checkbox extrafield readonly 2013-10-25 10:01:41 +02:00
Laurent Destailleur
16bcd6b5e5 Add error management to avoid blank page when there is no permission to 
read file.
 2013-10-23 19:19:54 +02:00
Laurent Destailleur
ca560b4f98 Fix: [ bug #1076 ] Shipment/Delivery PDFs 2013-10-23 18:02:16 +02:00
Laurent Destailleur
483138d195 Comments 2013-10-23 13:38:18 +02:00
Florian Henry
c86812339f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-23 11:26:05 +02:00
Florian Henry
9804527216 Fix bug in option display account number in list 2013-10-23 11:25:42 +02:00
Laurent Destailleur
d542576d23 Fix: Menu entry into getmenu_div is clicable on all line. 2013-10-22 18:43:57 +02:00
Laurent Destailleur
1412f33c4e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-22 00:37:15 +02:00
Laurent Destailleur
14717e6279 Comment 2013-10-22 00:30:55 +02:00
Laurent Destailleur
ec576c91cc Enhance prototype for tables 2013-10-21 13:43:31 +02:00
BENKE Charles
15b1507c84 Update html.formfile.class.php 
Add subfolders feature in GED managment
 2013-10-20 20:58:38 +02:00
Laurent Destailleur
305ca25267 New: Add menu entry to page massstockmove.php 2013-10-20 14:05:51 +02:00
Grand Philippe
c773f21c2c fix wrong call name 2013-10-19 12:50:18 +02:00
Laurent Destailleur
df930d08b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-18 14:03:35 +02:00
Laurent Destailleur
33b4c9fad7 Fix: Bug into xcal decode 2013-10-18 10:38:59 +02:00
Laurent Destailleur
bf3ca7a0f0 Fix: Avoid syntax error 2013-10-18 01:20:25 +02:00
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
Laurent Destailleur
0d36329336 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-14 15:56:42 +02:00
Regis Houssin
8daef9d99f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-12 11:58:57 +02:00
Regis Houssin
bc0f65b73c Fix: reorder lines problem 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2013-10-12 11:58:38 +02:00
Regis Houssin
8801d7a1eb Fix: reorder lines problem 2013-10-12 11:54:37 +02:00
Laurent Destailleur
de97cd1812 Fix: json 2013-10-11 18:33:21 +02:00
Laurent Destailleur
559b75c49b New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID. 2013-10-11 12:14:14 +02:00
Laurent Destailleur
b0e38f7619 Fix: Manage strange language code reported bu chrome browsers. 2013-10-11 10:01:47 +02:00
Laurent Destailleur
303cad162b Qual: Show the rule name used to make calculation and link to change 
rule.
 2013-10-10 19:33:49 +02:00
Laurent Destailleur
f4a83f0851 Qual: Debug of replenishment feature 2013-10-09 20:30:49 +02:00
Maxime Kohlhaas
845deb9a63 Add multilang management in ODT models 2013-10-08 09:17:04 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
Christophe Battarel
02278a399c better margin calculation (especially for credit notes) 2013-10-05 10:29:22 +02:00
Laurent Destailleur
019c86dff0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
470ccba80a Qual: Fix two awful code with hardcoded values. This remove also 2 TODO. 2013-09-26 15:41:04 +02:00
Laurent Destailleur
ca24b45aa9 Merge pull request #1101 from PaulPoulain/940-develop 
940 develop
 2013-09-26 05:00:57 -07:00
Laurent Destailleur
db7bcfd748 Fix: Sending email from thirdparty must add event into agenda if option 
is on.
 2013-09-25 21:36:40 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 19:58:22 +02:00
Laurent Destailleur
60fbde02ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-25 19:08:01 +02:00
Laurent Destailleur
072247f1c8 Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
Laurent Destailleur
c88072433c Merge pull request #1244 from defrance69/patch-12 
Update commonobject.class.php
 2013-09-25 08:18:49 -07:00
Laurent Destailleur
d111ee97c2 Doc 2013-09-25 12:37:19 +02:00
BENKE Charles
1c988fc559 Update commonobject.class.php 2013-09-25 11:14:50 +02:00
BENKE Charles
f88470d3b8 Update html.formcompany.class.php 
use paramter to select only active type of contact
 2013-09-25 10:17:27 +02:00
BENKE Charles
b400803a2a Update commonobject.class.php 
add complementary param
 2013-09-25 10:15:32 +02:00
Christophe Battarel
b197231c04 fix bad margin calculation for credit notes 2013-09-24 17:49:56 +02:00
Christophe Battarel
f13b9cec29 escape dialog title 2013-09-24 15:59:30 +02:00
Christophe Battarel
aa820d56ba Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
is reverts commit 8a4041e534.

Conflicts:

	htdocs/core/lib/company.lib.php
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
	htdocs/societe/class/societe.class.php

Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2013-09-24 15:52:19 +02:00
BENKE Charles
d978d64d59 Update commonobject.class.php 
just the active type of contact
 2013-09-24 14:19:52 +02:00
Laurent Destailleur
2088eaa6fd Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-24 13:17:58 +02:00
Laurent Destailleur
b6d5ebf81d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-24 11:02:01 +02:00
Laurent Destailleur
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
99de8b22a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-23 19:59:52 +02:00
Laurent Destailleur
890c96355d Check parameter to make bug detection seasier 2013-09-23 19:53:21 +02:00
Laurent Destailleur
6b2966794a Do not show free text for thirdparty email send form 2013-09-23 14:35:22 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Laurent Destailleur
cb04b05e85 New: Can send an email from thirdparty card. 2013-09-23 13:17:31 +02:00
Laurent Destailleur
7ed5d5e543 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-23 11:25:06 +02:00
Laurent Destailleur
26bce0a385 Merge pull request #1207 from defrance69/patch-12 
Update modProjet.class.php
 2013-09-23 00:39:03 -07:00
Laurent Destailleur
31d3e419b2 Fix: doxygen 2013-09-23 09:35:16 +02:00
Laurent Destailleur
9a475e9ed2 New: Add method to use a dictionnary as a combo box. 2013-09-22 23:54:01 +02:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 20:01:33 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
b9aac118aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-21 12:31:38 +02:00
Laurent Destailleur
fd564f5c7d Optimize cookie usage for boxes. Only 1 cookie per box, instead of 1 
cookie
per
parameter.
 2013-09-21 12:30:44 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Cédric Salvador
81a9bc3960 checkstyle 2013-09-20 10:56:15 +02:00
Cédric Salvador
9fdac2aa8e changed dol_htmlentities() parameters to match standard htmlentities() 2013-09-20 10:36:43 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
986794ad7f Fix doxygen 2013-09-18 23:39:53 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Maxime Kohlhaas
e3d4a7bc35 Fix : wrong contact list was used for cc and ccc in formmail 2013-09-18 13:36:22 +02:00
Laurent Destailleur
1e29a97a89 Fix: checkstyle 2013-09-17 21:12:34 +02:00
simnandez
f7299f1a28 [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 18:06:06 +02:00
simnandez
7f21e596dd [ task #1063 ] Allow edit localtaxes rate for thirds. Init Works 2013-09-17 17:17:59 +02:00
Laurent Destailleur
09de33ad97 Merge pull request #1232 from GPCsolutions/pgsql-installer 
Fixed SQL install script for PostgreSQL
 2013-09-16 10:39:11 -07:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
9826b202e9 New: Provide both tags for string formated amount and numeric amount 
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
 2013-09-16 12:42:01 +02:00
Christophe Battarel
33fbee51bd ability to copy contact address to clipboard 2013-09-15 19:09:22 +02:00
Christophe Battarel
a100faa4b1 ability to copy contact address to clipboard 2013-09-15 18:33:20 +02:00
Christophe Battarel
775d259f88 Fix: Supplier price displayed on document lines and margin infos didnt take discount 2013-09-15 14:52:41 +02:00
Laurent Destailleur
b20b82df3d Fix: we must use conf-currency as parameter of method price instead of 
using langs->getCurrencySymbol
 2013-09-15 13:04:38 +02:00
Laurent Destailleur
32d2615e93 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-15 12:18:35 +02:00
Laurent Destailleur
e970c01b1b Code comment 
Fix translation
 2013-09-15 12:17:45 +02:00
simnandez
59783cf556 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:52:57 +02:00
simnandez
4c7907b773 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:47:31 +02:00
Laurent Destailleur
57dee255a2 Normalize code 2013-09-14 14:41:12 +02:00
Laurent Destailleur
4c1faf626e Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 14:36:17 +02:00
Laurent Destailleur
914e167183 Fix: Bad sql request 2013-09-14 14:34:45 +02:00
BENKE Charles
5e9cb8a1d4 Update modProjet.class.php 
add export_dependencies_array
 2013-09-14 10:45:41 +02:00
BENKE Charles
085a8d68db Update html.formother.class.php 
bugfix
 2013-09-14 10:41:36 +02:00
Laurent Destailleur
f2bdd8c1d8 Work on alternative vat calculation mode 2013-09-13 17:43:26 +02:00
Cédric Salvador
b21226f2b7 fixed fatal error 2013-09-12 16:39:18 +02:00
Raphaël Doursenaud
875f9d55c7 Fixed tinyint for PostgreSQL in a more generic way 2013-09-11 17:34:35 +02:00
Laurent Destailleur
74f8a19134 Qual: Make code simpler 2013-09-11 15:17:31 +02:00
Laurent Destailleur
4b2ee84ede Merge pull request #1230 from GPCsolutions/deprecated-5.5 
Deprecated in PHP 5.5
 2013-09-11 06:09:26 -07:00
Raphaël Doursenaud
9636e1aafc Replaced PHP 5.5 deprecated calls 2013-09-11 14:48:02 +02:00
Laurent Destailleur
0bb18cb05c New: Can use tag {mm} before {yy} even when there is a reset into 
numbering masks.
Qual: Enhance phpunit tests to include this case.
 2013-09-11 14:18:56 +02:00
Laurent Destailleur
21d9aa2fe4 Fix: [ bug #1054 ] Customer Invoice Numbering failure 2013-09-11 11:01:02 +02:00
Laurent Destailleur
eb10093ae8 Fix: Regression detected by phpunit 2013-09-11 10:05:01 +02:00
Laurent Destailleur
fd17280521 Removed all checkstyle errors 2013-09-11 09:40:00 +02:00
simnandez
bc0356db1f [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 18:32:03 +02:00
simnandez
634f70a74d New: [ task #1060 ] Register fields localtax(1|2)_type into details 
tables. Invoices
 2013-09-10 17:07:38 +02:00
Laurent Destailleur
f195d59c9c Try to fix false positive with dolgraph 2013-09-10 16:12:20 +02:00
Laurent Destailleur
21602b34a9 Try to fix false positive with dolgraph 2013-09-10 15:56:40 +02:00
Laurent Destailleur
7d2109f8e8 Try to fix false positive with dolgraph 2013-09-10 15:50:05 +02:00
Laurent Destailleur
e467d63a94 Try to fix false positive 2013-09-10 15:45:36 +02:00
Laurent Destailleur
9314859ead More log to find bug 2013-09-10 15:21:56 +02:00
Laurent Destailleur
345aa33efd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-10 14:20:15 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
38d3746c11 Merge pull request #1226 from GPCsolutions/dolidb 
Added an abstract DolibDB class
 2013-09-10 03:36:34 -07:00
Raphaël Doursenaud
5426db63ff Added an abstract DolibDB class 2013-09-10 12:29:55 +02:00
Laurent Destailleur
598f6883a2 Doc comments 2013-09-10 11:39:20 +02:00
Laurent Destailleur
c147fc6016 Fix: checkstyle 
Try phpcs into travis
 2013-09-10 02:09:55 +02:00
Laurent Destailleur
2b8af33505 Fix: eof 2013-09-09 19:15:34 +02:00
Laurent Destailleur
d22985c5fa More accurate log file 2013-09-09 12:23:15 +02:00
Laurent Destailleur
74a50d8d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-07 19:51:00 +02:00
Laurent Destailleur
bd24711b30 Fix: navigation of supplier invoices 2013-09-07 19:50:47 +02:00
Laurent Destailleur
3a8784a6de Qual: Mutualize code 2013-09-07 19:08:08 +02:00
Laurent Destailleur
884965a679 Merge pull request #1218 from GPCsolutions/develop-review 
Fixed bad copy-paste
 2013-09-06 13:47:14 -07:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
87a4418baf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-06 10:50:44 +02:00
Laurent Destailleur
9fa6d4ccdf Fix: Avoid error for free products. Also add hidden otion to enable 
this. In most cases, we don't want to do this.
 2013-09-06 10:40:44 +02:00
Raphaël Doursenaud
ae36934746 Fixed bad copy-paste 2013-09-06 10:22:13 +02:00
Laurent Destailleur
38e4b0f9ac Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/watch
 2013-09-05 23:57:30 +02:00
Laurent Destailleur
d493dc8513 Merge pull request #1215 from GPCsolutions/develop-review 
Develop review
 2013-09-05 13:51:28 -07:00
Raphaël Doursenaud
36a281ce58 CSS fixes 2013-09-05 20:54:19 +02:00
Raphaël Doursenaud
8010389c08 Fixed wrong path in CSS 2013-09-05 20:29:06 +02:00
Raphaël Doursenaud
d39f2d655c Typo fix: remove unwanted comma 2013-09-05 20:28:24 +02:00
Raphaël Doursenaud
0e8eddb470 Revert "Method should be static" 
This reverts commit 4ca5bc3797.
 2013-09-05 19:00:00 +02:00
Raphaël Doursenaud
6e64e0e7be Fixed gd calls for windows bitmap images 2013-09-05 17:56:28 +02:00
Juanjo Menent
15bb60c8a1 Merge pull request #1212 from FHenry/develop 
Add ref supplier into muscadet model
 2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
cd684460ff Removed silly code 2013-09-05 17:30:17 +02:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
465d59ba82 Don't call non static class statically 2013-09-05 16:44:57 +02:00
Raphaël Doursenaud
4ca5bc3797 Method should be static 2013-09-05 16:44:02 +02:00
Raphaël Doursenaud
0c0740cac7 Don't call non static class statically 2013-09-05 16:43:22 +02:00
Raphaël Doursenaud
109cc09e82 Simplified JS 2013-09-05 16:37:23 +02:00
Laurent Destailleur
e40d644085 Fix: Remove warning 2013-09-04 16:49:20 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Laurent Destailleur
af22d38681 Fix: Bad total without tax 2013-09-04 15:07:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
Florian Henry
d8ddb8b3e7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f Add ref supplier into muscadet model 2013-09-03 20:07:08 +02:00
Laurent Destailleur
23df3d82e5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 18:10:55 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
Juanjo Menent
7293d58002 Merge pull request #1208 from grandoc/develop 
Add an additional description for the category products
 2013-09-03 02:43:30 -07:00
Grand Philippe
6d6f30725b Add an additional description for the category products 2013-09-03 11:41:33 +02:00
Laurent Destailleur
e40452f3b2 Fix: Bug if modules not enabled 2013-09-03 11:36:28 +02:00
Grand Philippe
dfdc9da781 Add an additional description for the category products 2013-09-03 11:15:19 +02:00
BENKE Charles
bb8f8332f9 Update modProjet.class.php 
enhance export feature with
left join and projet_task_time data
 2013-09-03 11:12:29 +02:00
Grand Philippe
da384dda18 uniformize 2013-09-02 11:53:07 +02:00
Laurent Destailleur
cb52af4f47 Qual: Make code more generic 2013-09-02 02:14:16 +02:00
Laurent Destailleur
b95aa1ac7b Fix: select list on external table 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-09-02 00:41:14 +02:00
Laurent Destailleur
3a4896609a Fix: Remove debug print 2013-09-02 00:38:13 +02:00
Laurent Destailleur
e6611b6ba1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-02 00:34:55 +02:00
Laurent Destailleur
51cc957b97 Fix: select list on external table 2013-09-02 00:34:41 +02:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop 
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
 2013-09-01 15:01:33 -07:00
Laurent Destailleur
1392f4e623 Merge pull request #1203 from PaulPoulain/966-develop 
T966-develop : Put the poste of the contact in the list
 2013-09-01 14:49:06 -07:00
Laurent Destailleur
8cd1563f58 More test 2013-09-01 20:55:59 +02:00
Laurent Destailleur
4272209832 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-31 12:44:13 +02:00
Laurent Destailleur
a8096c7359 New: Export/import profile include state. 2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5 [ task #1044 ] Add option to enabled thirdparty number into select 
thirdparty list
 2013-08-30 18:18:58 +02:00
Florian Henry
8b9b682eaf Merge remote-tracking branch 'origin/develop' into develop 2013-08-30 18:11:47 +02:00
simnandez
2a8aa50163 Fix: Intervention box links to contracts id 
Conflicts:
	htdocs/core/boxes/box_ficheinter.php
 2013-08-29 12:12:02 +02:00
simnandez
b86e20f0e6 Fix: Intervention box links to contracts id 2013-08-29 12:05:29 +02:00
simnandez
a321264a2a Fix: Localtaxes balance not showing 
Conflicts:
	ChangeLog
 2013-08-29 10:03:32 +02:00
simnandez
fa4a9c73c4 Fix: Localtaxes balance not showing 2013-08-29 09:58:07 +02:00
lalaina rasamoelina
3156f8cae0 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-29 09:30:26 +02:00
Florian Henry
29396bd51a Change SQL syntax 2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb adjust spacing 2013-08-28 16:50:38 +02:00
Florian Henry
650689d294 Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103 2013-08-28 16:49:22 +02:00
Florian Henry
cc90c92cc0 Fix: Mailing module : if an email is already in destinaires list all 
other email from selector was not inserted
 2013-08-28 16:33:21 +02:00
lalaina rasamoelina
ca6a973d96 T940-develop: creating a bouton which permit to create an event in the propal,and command . 
If we create an event in the propal, then  the events will be attached in the propal
		and if it's for command,it will be attached in the command
 2013-08-27 15:51:06 +02:00
Regis Houssin
841961df4e Fix: wrong function name 2013-08-27 14:53:24 +02:00
Laurent Destailleur
657c4d6e90 Fix: Fix graph for product distribution. 
Add limit and add entry other.
 2013-08-27 11:54:07 +02:00
simnandez
34fe1fba7f Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:44:00 +02:00
Grand Philippe
24e6042378 some fix for contract model 2013-08-26 15:32:56 +02:00
Grand Philippe
7a64ad1a26 some fix for contract model and clean code 2013-08-26 14:29:46 +02:00
Laurent Destailleur
903b75c1cd Merge pull request #1165 from PaulPoulain/975-develop 
T975-develop: Don't print the mail of the contact who is gone
 2013-08-25 03:23:26 -07:00
Laurent Destailleur
94d3e6d3cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
 2013-08-24 22:45:57 +02:00
Laurent Destailleur
70f7321d51 Comment 2013-08-24 22:45:02 +02:00
Laurent Destailleur
07cba2d232 Merge pull request #1194 from grandoc/develop 
fix : warning during install
 2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
Laurent Destailleur
6d2c27beec Fix: header already sent 2013-08-24 22:09:32 +02:00
Laurent Destailleur
1c08cad6b9 Fix: Bad translation (to pick to 3.4) 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2013-08-24 21:41:36 +02:00
Laurent Destailleur
1c527b8db9 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-24 20:59:02 +02:00
Laurent Destailleur
75bd05d212 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-24 19:36:17 +02:00
Grand Philippe
a0c04a548b first step to complete contract functionalities 2013-08-24 15:59:49 +02:00
Grand Philippe
e56e0ebfb5 add extrafields 2013-08-24 13:49:55 +02:00
Grand Philippe
71a9e148b3 fix : warning during install 2013-08-24 11:34:34 +02:00
Juanjo Menent
376b2812fe Merge pull request #1190 from altairis-fr/develop 
add ability to modify margin rate on line edit if authorized
 2013-08-23 00:18:08 -07:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
c1dae58055 Fix: Bad translation (to pick to 3.4) 2013-08-22 12:46:10 +02:00
Christophe Battarel
4df216afbc add ability to define margin when adding line with new experimental form 2013-08-22 12:13:14 +02:00
Christophe Battarel
f37c24f8ff allow to modify margin rate or mark rate but not both 2013-08-22 11:45:27 +02:00
Christophe Battarel
e672783adb add ability to modify margin rate on line edit if authorized 2013-08-22 11:39:55 +02:00
lalaina rasamoelina
8a4041e534 T975-develop Add an element (statut) in the table llx_socpeople 
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b Put the status of contact in the list of contact 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373 Style of page 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178 Delete the contact who are gone,in the email list 2013-08-22 11:04:06 +02:00
Laurent Destailleur
05040d1997 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-21 22:21:33 +02:00
Laurent Destailleur
ea4ac30b28 Fix: more responsive box 2013-08-21 21:39:39 +02:00
Laurent Destailleur
327aa80ed0 Fix: Error management 
New: Autoselect category in list if there is only one element in list.
 2013-08-21 13:02:33 +02:00
Laurent Destailleur
c4bc10b8eb Qual: Clean code by moving synchro with mailman into mailman trigger 
New: A trigger can return an array of error strings instead of one error
string.
 2013-08-21 12:39:20 +02:00
simnandez
913888824f Remove duplicate $user 2013-08-20 12:26:39 +02:00
Christophe Battarel
4c7741f5f0 manage user permissions for margin display 2013-08-20 12:11:19 +02:00
Christophe Battarel
06b8e939bd manage user permissions for margin rate 2013-08-20 12:04:01 +02:00
Christophe Battarel
220f9b7e9f define global user variables so templates can manage user permissions 2013-08-20 12:01:52 +02:00
Christophe Battarel
8128ed0556 define user permissions on margin module 
update changelog
 2013-08-20 12:00:16 +02:00
Laurent Destailleur
e460aa335c New: When there is no data on pie chart, can set color to an empty 
value.
 2013-08-20 11:51:24 +02:00
Laurent Destailleur
b18d5166de Fix: Size of picture into PDF 2013-08-19 13:30:30 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Juanjo Menent
8ba3410766 Merge pull request #1179 from altatof/saisie_marges 
ability to define margin rate on quotes, orders, invoices
 2013-08-14 01:00:29 -07:00
simnandez
3577025f0e Fix update extrafield do not display immediatly 2013-08-14 09:56:08 +02:00
Florian Henry
60b3f61339 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-08-13 12:13:47 +02:00
simnandez
5cbfa61731 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Florian Henry
26d1352de4 Fix update extrafield do not display immediatly 2013-08-12 14:30:42 +02:00
Laurent Destailleur
3502747247 Merge pull request #1175 from FHenry/develop 
Add pdf link into supplier invoice list and supplier order list
 2013-08-09 12:18:40 -07:00
Laurent Destailleur
ff4ebe423b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-09 19:21:32 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Florian Henry
75701ee995 Fix: Supplier invoice and supplier order are not displayed into object 
link into agenda event card
 2013-08-09 13:11:18 +02:00
Laurent Destailleur
ecf8e06487 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-08 20:07:24 +02:00
Laurent Destailleur
bfd2d7ada2 Fix: Sort order works with special chars. 2013-08-08 20:06:56 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
2a0597a6d4 Merge pull request #1161 from PaulPoulain/948-develop 
T948-develop :Classify Billed when the price of bill is greater than command
 2013-08-07 16:48:32 -07:00
Laurent Destailleur
b1f528f4d5 Comment code of a deprecated variable. 2013-08-07 20:56:10 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33 Fix: Bad dir 2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4 Fix: Bad var name 2013-08-07 13:33:22 +02:00
Laurent Destailleur
4346a3f90f Fix: Param must be a regex string 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-08-06 19:34:13 +02:00
Laurent Destailleur
3caf119596 Fix: Param must be a regex string 2013-08-06 19:23:43 +02:00
lalaina rasamoelina
0fa4739d47 T948-develop :Classify Billed when the price of bill is greater than command 
-In the workflow i've added on bouton which permitted
		to classify billed when the price of bills is greater
 		than command,if her status is delivered

		/htdocs/admin/workflow.php
 2013-08-06 16:57:40 +02:00
Juanjo Menent
aab90bfe76 Merge pull request #1154 from atm-maxime/develop 
Fix : supplier invoice mask + numbering
 2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e Numbering should be on invoice date, not creation date 2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905 Fix : supplier invoice mask + numbering 2013-08-06 15:27:51 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6 Fix: lang file 2013-08-06 03:56:59 +02:00
Laurent Destailleur
b7cada9a99 Fix: End of menu when no module selected. 2013-08-06 03:01:56 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
8d90289bfc Merge pull request #1153 from csalvador/print_address_hook 
added hook to the print address function
 2013-08-05 11:51:08 -07:00
Laurent Destailleur
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
928446596d Perf: Optimize memory usage when generating graph. 2013-08-05 18:30:10 +02:00
Cédric Salvador
0127ed8b33 added hook to the print address function 2013-08-05 18:07:10 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00
Laurent Destailleur
447d0063af Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/sl_SI/withdrawals.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/bills.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/other.lang
	htdocs/langs/zh_CN/products.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/agenda.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/companies.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/contracts.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/exports.lang
	htdocs/langs/zh_TW/install.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/mails.lang
	htdocs/langs/zh_TW/members.lang
	htdocs/langs/zh_TW/orders.lang
	htdocs/langs/zh_TW/propal.lang
	htdocs/langs/zh_TW/suppliers.lang
 2013-08-03 16:24:52 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
Laurent Destailleur
c18fed7e4c New: A box can use a "or" on module conditions 2013-08-02 14:54:22 +02:00
Juanjo Menent
ba8d094ec5 Merge pull request #1152 from atm-maxime/develop 
Better fix for email text / signature integration
 2013-08-02 03:13:42 -07:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Maxime Kohlhaas
a0738e86d8 Better fix for email text / signature integration 2013-08-02 10:24:09 +02:00
Laurent Destailleur
a35ee022f3 Merge pull request #1150 from atm-maxime/develop 
Task # 1016 : deposits numbering
 2013-08-01 13:06:46 -07:00
simnandez
d8fcec287b Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain. 2013-08-01 18:44:21 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:01:25 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Laurent Destailleur
2fa1032079 Merge pull request #1145 from atm-maxime/develop 
Fix : email message combined with html signature made troubles with line breaks
 2013-08-01 02:09:52 -07:00
Laurent Destailleur
ba2c6d4d54 Fix: Confirm boxes with jmobile 2013-08-01 05:13:13 +02:00
Laurent Destailleur
53672dff75 Fix: Confirm boxes with jmobile 2013-08-01 04:20:08 +02:00
Laurent Destailleur
a334b96469 Optimize screen size 2013-08-01 02:28:47 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Maxime Kohlhaas
3395df2b66 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 15:23:27 +02:00
Laurent Destailleur
6e289874fe Merge pull request #1146 from csalvador/callfix 
fixed bad function call causing select_produits_list to fail
 2013-07-31 05:52:19 -07:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contrat/liste.php
 2013-07-31 12:45:39 +02:00
Cédric Salvador
f0bbdfddfb fixed bad function call causing select_produits_list to fail 2013-07-31 10:08:33 +02:00
Maxime Kohlhaas
27cfe802aa Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 09:03:20 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management 
for project.
 2013-07-30 19:08:58 +02:00
Maxime Kohlhaas
c40e187842 Typo 2013-07-30 17:30:09 +02:00
Maxime Kohlhaas
dfae157cc5 Fix : email message combined with html signature made troubles with line breaks 2013-07-30 17:29:24 +02:00
Laurent Destailleur
57ce331833 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-30 17:23:13 +02:00
Laurent Destailleur
eeb8ef57c9 Fix: grip and close for title must differ from grip and close used for 
other styles.
 2013-07-30 17:22:52 +02:00
Maxime Kohlhaas
bfb01da04f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011 2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
dae36229a4 Task # 1011 : add payment terms and payment mode on supplier card 2013-07-30 15:06:57 +02:00
Florian Henry
21bdabc248 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877 Fix extrafeild thirdparty import and export 2013-07-30 14:18:56 +02:00
Laurent Destailleur
a48236b304 Merge pull request #1139 from GPCsolutions/replenishment 
Replenishment Task #918
 2013-07-30 03:28:13 -07:00
Laurent Destailleur
1c24f9e35e Merge pull request #1138 from atm-maxime/3.4 
Fix : Numbering on supplier invoice was not saved and on shipment displa...
 2013-07-30 03:22:29 -07:00
Cédric Salvador
370f6ac857 fixed select_product_fourn_price closes #43 2013-07-30 10:24:37 +02:00
Maxime Kohlhaas
f9c2910f84 Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok 2013-07-30 09:21:45 +02:00
Laurent Destailleur
87713c49ac New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with 
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
 2013-07-29 19:12:04 +02:00
Cédric Salvador
bd9c4556e8 Preselected supplier when there's only one 2013-07-29 12:31:13 +02:00
Cédric Salvador
9dfa5c4218 selects 2013-07-29 12:31:09 +02:00
Cédric Salvador
8666725c62 Preselected supplier when there's only one 2013-07-29 12:31:08 +02:00
Cédric Salvador
0e77b273df copyright 2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08 moved page + added link in the left menu 2013-07-29 12:31:06 +02:00
Florian Henry
d6f31d61bf Fix Typhon model $mysoc global is missing 2013-07-29 12:21:52 +02:00
Laurent Destailleur
ad6bd5047f Add error log to warn when module does not match specifications. 2013-07-28 14:42:50 +02:00
Laurent Destailleur
0743521b6b - No need to load css of plugin fileupload (plugin never loaded). Too 
much bugged to be included by default.
- Vertical menu must be under horizontal menu, even if horizontal menu
is wrapped.
- Add an empty li at end of list to provide more options for skins.
 2013-07-28 05:35:51 +02:00
Laurent Destailleur
843478317e Qual: Reduce CSS size by mutualizings styles. 2013-07-27 18:21:35 +02:00
Laurent Destailleur
444a3328c6 New: More options to select status of users into select user list. 2013-07-27 14:45:55 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
14dfbfc40c Fix: W3C (form into tr make some browsers crazy) 2013-07-27 13:29:06 +02:00
Laurent Destailleur
14dc6b0025 Merge pull request #1070 from jfefe/extra-listlabel 
Can choose several fields to display with extrafield list of table
 2013-07-27 03:24:34 -07:00
Laurent Destailleur
385d3612c5 Merge pull request #1136 from jfefe/extrarequired 
Missing checks on extrafields
 2013-07-27 03:09:44 -07:00
Laurent Destailleur
2f25e07e5a Add class for body into login page 2013-07-27 11:53:15 +02:00
Laurent Destailleur
5ea500383c Merge pull request #1102 from PaulPoulain/978-develop 
[BUGFIX] T978 Delete users who are disabled
 2013-07-27 02:50:11 -07:00
jfefe
90e245ca5a Merge branch 'extra-listlabel' of github.com:jfefe/dolibarr into extra-listlabel 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-07-27 01:29:05 +02:00
jfefe
95e2f30f6b Can choose several fields to display with extrafield list of table 2013-07-27 01:21:19 +02:00
Laurent Destailleur
99e5bf3120 New: Enhance graphical boxes. Prepare to show filters form to modify 
graph.
 2013-07-26 18:40:43 +02:00
jfefe
473541f19d Fix : bad test field when checking extrafield is required 2013-07-26 15:41:17 +02:00
Laurent Destailleur
d0af692ed5 Fix: date must be reported according to user timezone 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-26 15:23:41 +02:00
Laurent Destailleur
f2f8d60f19 Fix: date must be reported according to user timezone 2013-07-26 15:21:32 +02:00
Laurent Destailleur
5608e320f7 New: Can add a suffix into filename of template after -. This may be 
used in future as specific criteria to filter list of numbering models
to show.
 2013-07-26 15:10:56 +02:00
Laurent Destailleur
8e3d86c7a5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2013-07-26 14:59:18 +02:00
Laurent Destailleur
e5de4c10ad Fix: date must be reported according to user timezone 2013-07-26 14:49:46 +02:00
jfefe
c431fc716f Check if an required extrafield is filled. 
Method setOptionalsFromPost now return -1 if required field is blank
 2013-07-26 13:18:23 +02:00
simnandez
7efacecb08 New: [ task #1005 ] Adapting to Spanish legislation bill numbering 2013-07-26 12:46:34 +02:00
Maxime Kohlhaas
1199e61f4b CRLF issue 2013-07-26 12:33:58 +02:00
Laurent Destailleur
1e96452c6c New: Can show images of product onto proposals. 2013-07-26 12:24:30 +02:00
Laurent Destailleur
c4d3307bfa Qual: Normalize file name. 2013-07-26 11:36:36 +02:00
Laurent Destailleur
61f11d3621 Fix: Duplicate tooltip 2013-07-26 11:12:29 +02:00
jfefe
95bc40d0df Missing attribute to indicate required fields 2013-07-26 08:51:22 +02:00
Laurent Destailleur
3ecb9c2dd8 Merge pull request #1130 from FHenry/3.4 
Avoid php warning if extrafield "list from table" have bad settings
 2013-07-25 13:40:09 -07:00
Laurent Destailleur
fe079f71da Merge remote-tracking branch 'origin/3.3' into 3.4 2013-07-25 21:53:38 +02:00
Florian Henry
2f112efad5 Avoid php warning if extrafield list from table have bad settings 2013-07-25 20:18:45 +02:00
Laurent Destailleur
16d530b22d Fix: Watermark make pagebreak crazy. 2013-07-25 18:58:47 +02:00
Laurent Destailleur
58da76292f Fix: Watermark make pagebreak crazy. 2013-07-25 18:56:09 +02:00
Laurent Destailleur
339118d6f4 Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee Fix: Color no more lost 2013-07-24 20:20:10 +02:00
Laurent Destailleur
44682bd932 Merge pull request #1128 from defrance69/patch-9 
Update pdf_blochet.class.php
 2013-07-24 07:07:41 -07:00
Laurent Destailleur
2266b8b2a4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/langs/ar_SA/bookmarks.lang
	htdocs/langs/ar_SA/boxes.lang
	htdocs/langs/ar_SA/cashdesk.lang
	htdocs/langs/ar_SA/categories.lang
	htdocs/langs/ar_SA/commercial.lang
	htdocs/langs/ar_SA/companies.lang
	htdocs/langs/ar_SA/compta.lang
	htdocs/langs/ar_SA/contracts.lang
	htdocs/langs/ar_SA/deliveries.lang
	htdocs/langs/ar_SA/dict.lang
	htdocs/langs/ar_SA/donations.lang
	htdocs/langs/ar_SA/ecm.lang
	htdocs/langs/ar_SA/errors.lang
	htdocs/langs/ar_SA/exports.lang
	htdocs/langs/ar_SA/externalsite.lang
	htdocs/langs/ar_SA/ftp.lang
	htdocs/langs/ar_SA/help.lang
	htdocs/langs/ar_SA/install.lang
	htdocs/langs/ar_SA/interventions.lang
	htdocs/langs/ar_SA/languages.lang
	htdocs/langs/ar_SA/ldap.lang
	htdocs/langs/ar_SA/mails.lang
	htdocs/langs/ar_SA/main.lang
	htdocs/langs/ar_SA/members.lang
	htdocs/langs/ar_SA/orders.lang
	htdocs/langs/ar_SA/oscommerce.lang
	htdocs/langs/ar_SA/paybox.lang
	htdocs/langs/ar_SA/paypal.lang
	htdocs/langs/ar_SA/projects.lang
	htdocs/langs/ar_SA/propal.lang
	htdocs/langs/ar_SA/sendings.lang
	htdocs/langs/ar_SA/shop.lang
	htdocs/langs/ar_SA/sms.lang
	htdocs/langs/ar_SA/stocks.lang
	htdocs/langs/ar_SA/suppliers.lang
	htdocs/langs/ar_SA/trips.lang
	htdocs/langs/ar_SA/users.lang
	htdocs/langs/ar_SA/withdrawals.lang
	htdocs/langs/ar_SA/workflow.lang
	htdocs/langs/bg_BG/admin.lang
	htdocs/langs/bg_BG/agenda.lang
	htdocs/langs/bg_BG/banks.lang
	htdocs/langs/bg_BG/bills.lang
	htdocs/langs/bg_BG/bookmarks.lang
	htdocs/langs/bg_BG/boxes.lang
	htdocs/langs/bg_BG/cashdesk.lang
	htdocs/langs/bg_BG/categories.lang
	htdocs/langs/bg_BG/commercial.lang
	htdocs/langs/bg_BG/companies.lang
	htdocs/langs/bg_BG/compta.lang
	htdocs/langs/bg_BG/contracts.lang
	htdocs/langs/bg_BG/deliveries.lang
	htdocs/langs/bg_BG/dict.lang
	htdocs/langs/bg_BG/donations.lang
	htdocs/langs/bg_BG/ecm.lang
	htdocs/langs/bg_BG/errors.lang
	htdocs/langs/bg_BG/exports.lang
	htdocs/langs/bg_BG/externalsite.lang
	htdocs/langs/bg_BG/ftp.lang
	htdocs/langs/bg_BG/help.lang
	htdocs/langs/bg_BG/holiday.lang
	htdocs/langs/bg_BG/install.lang
	htdocs/langs/bg_BG/interventions.lang
	htdocs/langs/bg_BG/languages.lang
	htdocs/langs/bg_BG/ldap.lang
	htdocs/langs/bg_BG/mailmanspip.lang
	htdocs/langs/bg_BG/mails.lang
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/bg_BG/members.lang
	htdocs/langs/bg_BG/orders.lang
	htdocs/langs/bg_BG/oscommerce.lang
	htdocs/langs/bg_BG/other.lang
	htdocs/langs/bg_BG/paybox.lang
	htdocs/langs/bg_BG/paypal.lang
	htdocs/langs/bg_BG/products.lang
	htdocs/langs/bg_BG/projects.lang
	htdocs/langs/bg_BG/propal.lang
	htdocs/langs/bg_BG/sendings.lang
	htdocs/langs/bg_BG/shop.lang
	htdocs/langs/bg_BG/sms.lang
	htdocs/langs/bg_BG/stocks.lang
	htdocs/langs/bg_BG/suppliers.lang
	htdocs/langs/bg_BG/trips.lang
	htdocs/langs/bg_BG/users.lang
	htdocs/langs/bg_BG/withdrawals.lang
	htdocs/langs/bg_BG/workflow.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/da_DK/agenda.lang
	htdocs/langs/da_DK/banks.lang
	htdocs/langs/da_DK/bookmarks.lang
	htdocs/langs/da_DK/boxes.lang
	htdocs/langs/da_DK/cashdesk.lang
	htdocs/langs/da_DK/categories.lang
	htdocs/langs/da_DK/commercial.lang
	htdocs/langs/da_DK/companies.lang
	htdocs/langs/da_DK/compta.lang
	htdocs/langs/da_DK/contracts.lang
	htdocs/langs/da_DK/deliveries.lang
	htdocs/langs/da_DK/dict.lang
	htdocs/langs/da_DK/donations.lang
	htdocs/langs/da_DK/errors.lang
	htdocs/langs/da_DK/exports.lang
	htdocs/langs/da_DK/externalsite.lang
	htdocs/langs/da_DK/ftp.lang
	htdocs/langs/da_DK/install.lang
	htdocs/langs/da_DK/interventions.lang
	htdocs/langs/da_DK/languages.lang
	htdocs/langs/da_DK/mails.lang
	htdocs/langs/da_DK/members.lang
	htdocs/langs/da_DK/orders.lang
	htdocs/langs/da_DK/oscommerce.lang
	htdocs/langs/da_DK/paybox.lang
	htdocs/langs/da_DK/paypal.lang
	htdocs/langs/da_DK/projects.lang
	htdocs/langs/da_DK/propal.lang
	htdocs/langs/da_DK/sendings.lang
	htdocs/langs/da_DK/shop.lang
	htdocs/langs/da_DK/sms.lang
	htdocs/langs/da_DK/stocks.lang
	htdocs/langs/da_DK/suppliers.lang
	htdocs/langs/da_DK/trips.lang
	htdocs/langs/da_DK/users.lang
	htdocs/langs/da_DK/withdrawals.lang
	htdocs/langs/da_DK/workflow.lang
	htdocs/langs/de_DE/admin.lang
	htdocs/langs/de_DE/agenda.lang
	htdocs/langs/de_DE/banks.lang
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/de_DE/bookmarks.lang
	htdocs/langs/de_DE/boxes.lang
	htdocs/langs/de_DE/cashdesk.lang
	htdocs/langs/de_DE/categories.lang
	htdocs/langs/de_DE/commercial.lang
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/de_DE/compta.lang
	htdocs/langs/de_DE/contracts.lang
	htdocs/langs/de_DE/deliveries.lang
	htdocs/langs/de_DE/dict.lang
	htdocs/langs/de_DE/donations.lang
	htdocs/langs/de_DE/ecm.lang
	htdocs/langs/de_DE/errors.lang
	htdocs/langs/de_DE/exports.lang
	htdocs/langs/de_DE/externalsite.lang
	htdocs/langs/de_DE/ftp.lang
	htdocs/langs/de_DE/help.lang
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/interventions.lang
	htdocs/langs/de_DE/languages.lang
	htdocs/langs/de_DE/ldap.lang
	htdocs/langs/de_DE/mails.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/de_DE/members.lang
	htdocs/langs/de_DE/orders.lang
	htdocs/langs/de_DE/oscommerce.lang
	htdocs/langs/de_DE/other.lang
	htdocs/langs/de_DE/paybox.lang
	htdocs/langs/de_DE/paypal.lang
	htdocs/langs/de_DE/products.lang
	htdocs/langs/de_DE/projects.lang
	htdocs/langs/de_DE/propal.lang
	htdocs/langs/de_DE/sendings.lang
	htdocs/langs/de_DE/shop.lang
	htdocs/langs/de_DE/sms.lang
	htdocs/langs/de_DE/stocks.lang
	htdocs/langs/de_DE/suppliers.lang
	htdocs/langs/de_DE/trips.lang
	htdocs/langs/de_DE/users.lang
	htdocs/langs/de_DE/withdrawals.lang
	htdocs/langs/de_DE/workflow.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/langs/en_US/bookmarks.lang
	htdocs/langs/en_US/ftp.lang
	htdocs/langs/en_US/other.lang
	htdocs/langs/en_US/paypal.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/bookmarks.lang
	htdocs/langs/et_EE/boxes.lang
	htdocs/langs/et_EE/cashdesk.lang
	htdocs/langs/et_EE/categories.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/contracts.lang
	htdocs/langs/et_EE/deliveries.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/donations.lang
	htdocs/langs/et_EE/ecm.lang
	htdocs/langs/et_EE/errors.lang
	htdocs/langs/et_EE/exports.lang
	htdocs/langs/et_EE/externalsite.lang
	htdocs/langs/et_EE/ftp.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/install.lang
	htdocs/langs/et_EE/interventions.lang
	htdocs/langs/et_EE/languages.lang
	htdocs/langs/et_EE/ldap.lang
	htdocs/langs/et_EE/mails.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/members.lang
	htdocs/langs/et_EE/orders.lang
	htdocs/langs/et_EE/oscommerce.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/paybox.lang
	htdocs/langs/et_EE/paypal.lang
	htdocs/langs/et_EE/products.lang
	htdocs/langs/et_EE/projects.lang
	htdocs/langs/et_EE/propal.lang
	htdocs/langs/et_EE/sendings.lang
	htdocs/langs/et_EE/shop.lang
	htdocs/langs/et_EE/sms.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/trips.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/et_EE/workflow.lang
	htdocs/langs/fa_IR/agenda.lang
	htdocs/langs/fa_IR/banks.lang
	htdocs/langs/fa_IR/bookmarks.lang
	htdocs/langs/fa_IR/boxes.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fa_IR/commercial.lang
	htdocs/langs/fa_IR/companies.lang
	htdocs/langs/fa_IR/compta.lang
	htdocs/langs/fa_IR/contracts.lang
	htdocs/langs/fa_IR/deliveries.lang
	htdocs/langs/fa_IR/dict.lang
	htdocs/langs/fa_IR/donations.lang
	htdocs/langs/fa_IR/ecm.lang
	htdocs/langs/fa_IR/errors.lang
	htdocs/langs/fa_IR/exports.lang
	htdocs/langs/fa_IR/ftp.lang
	htdocs/langs/fa_IR/help.lang
	htdocs/langs/fa_IR/install.lang
	htdocs/langs/fa_IR/interventions.lang
	htdocs/langs/fa_IR/languages.lang
	htdocs/langs/fa_IR/ldap.lang
	htdocs/langs/fa_IR/mails.lang
	htdocs/langs/fa_IR/main.lang
	htdocs/langs/fa_IR/members.lang
	htdocs/langs/fa_IR/orders.lang
	htdocs/langs/fa_IR/oscommerce.lang
	htdocs/langs/fa_IR/paybox.lang
	htdocs/langs/fa_IR/paypal.lang
	htdocs/langs/fa_IR/projects.lang
	htdocs/langs/fa_IR/propal.lang
	htdocs/langs/fa_IR/shop.lang
	htdocs/langs/fa_IR/stocks.lang
	htdocs/langs/fa_IR/suppliers.lang
	htdocs/langs/fa_IR/trips.lang
	htdocs/langs/fa_IR/users.lang
	htdocs/langs/fa_IR/withdrawals.lang
	htdocs/langs/fi_FI/agenda.lang
	htdocs/langs/fi_FI/banks.lang
	htdocs/langs/fi_FI/bookmarks.lang
	htdocs/langs/fi_FI/boxes.lang
	htdocs/langs/fi_FI/cashdesk.lang
	htdocs/langs/fi_FI/categories.lang
	htdocs/langs/fi_FI/commercial.lang
	htdocs/langs/fi_FI/companies.lang
	htdocs/langs/fi_FI/compta.lang
	htdocs/langs/fi_FI/contracts.lang
	htdocs/langs/fi_FI/deliveries.lang
	htdocs/langs/fi_FI/dict.lang
	htdocs/langs/fi_FI/donations.lang
	htdocs/langs/fi_FI/errors.lang
	htdocs/langs/fi_FI/exports.lang
	htdocs/langs/fi_FI/externalsite.lang
	htdocs/langs/fi_FI/ftp.lang
	htdocs/langs/fi_FI/install.lang
	htdocs/langs/fi_FI/interventions.lang
	htdocs/langs/fi_FI/languages.lang
	htdocs/langs/fi_FI/mails.lang
	htdocs/langs/fi_FI/members.lang
	htdocs/langs/fi_FI/orders.lang
	htdocs/langs/fi_FI/paybox.lang
	htdocs/langs/fi_FI/paypal.lang
	htdocs/langs/fi_FI/projects.lang
	htdocs/langs/fi_FI/propal.lang
	htdocs/langs/fi_FI/sendings.lang
	htdocs/langs/fi_FI/sms.lang
	htdocs/langs/fi_FI/stocks.lang
	htdocs/langs/fi_FI/suppliers.lang
	htdocs/langs/fi_FI/trips.lang
	htdocs/langs/fi_FI/users.lang
	htdocs/langs/fi_FI/withdrawals.lang
	htdocs/langs/fi_FI/workflow.lang
	htdocs/langs/fr_FR/bookmarks.lang
	htdocs/langs/fr_FR/externalsite.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/paybox.lang
	htdocs/langs/fr_FR/paypal.lang
	htdocs/langs/he_IL/workflow.lang
	htdocs/langs/hu_HU/admin.lang
	htdocs/langs/hu_HU/agenda.lang
	htdocs/langs/hu_HU/banks.lang
	htdocs/langs/hu_HU/bills.lang
	htdocs/langs/hu_HU/boxes.lang
	htdocs/langs/hu_HU/cashdesk.lang
	htdocs/langs/hu_HU/commercial.lang
	htdocs/langs/hu_HU/companies.lang
	htdocs/langs/hu_HU/compta.lang
	htdocs/langs/hu_HU/contracts.lang
	htdocs/langs/hu_HU/deliveries.lang
	htdocs/langs/hu_HU/dict.lang
	htdocs/langs/hu_HU/donations.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/hu_HU/exports.lang
	htdocs/langs/hu_HU/externalsite.lang
	htdocs/langs/hu_HU/install.lang
	htdocs/langs/hu_HU/interventions.lang
	htdocs/langs/hu_HU/languages.lang
	htdocs/langs/hu_HU/mails.lang
	htdocs/langs/hu_HU/main.lang
	htdocs/langs/hu_HU/members.lang
	htdocs/langs/hu_HU/orders.lang
	htdocs/langs/hu_HU/oscommerce.lang
	htdocs/langs/hu_HU/other.lang
	htdocs/langs/hu_HU/paybox.lang
	htdocs/langs/hu_HU/paypal.lang
	htdocs/langs/hu_HU/projects.lang
	htdocs/langs/hu_HU/propal.lang
	htdocs/langs/hu_HU/sendings.lang
	htdocs/langs/hu_HU/sms.lang
	htdocs/langs/hu_HU/stocks.lang
	htdocs/langs/hu_HU/suppliers.lang
	htdocs/langs/hu_HU/trips.lang
	htdocs/langs/hu_HU/users.lang
	htdocs/langs/hu_HU/withdrawals.lang
	htdocs/langs/hu_HU/workflow.lang
	htdocs/langs/is_IS/agenda.lang
	htdocs/langs/is_IS/banks.lang
	htdocs/langs/is_IS/bookmarks.lang
	htdocs/langs/is_IS/boxes.lang
	htdocs/langs/is_IS/cashdesk.lang
	htdocs/langs/is_IS/categories.lang
	htdocs/langs/is_IS/commercial.lang
	htdocs/langs/is_IS/companies.lang
	htdocs/langs/is_IS/compta.lang
	htdocs/langs/is_IS/contracts.lang
	htdocs/langs/is_IS/deliveries.lang
	htdocs/langs/is_IS/dict.lang
	htdocs/langs/is_IS/donations.lang
	htdocs/langs/is_IS/ecm.lang
	htdocs/langs/is_IS/errors.lang
	htdocs/langs/is_IS/exports.lang
	htdocs/langs/is_IS/externalsite.lang
	htdocs/langs/is_IS/ftp.lang
	htdocs/langs/is_IS/help.lang
	htdocs/langs/is_IS/install.lang
	htdocs/langs/is_IS/interventions.lang
	htdocs/langs/is_IS/languages.lang
	htdocs/langs/is_IS/ldap.lang
	htdocs/langs/is_IS/mails.lang
	htdocs/langs/is_IS/main.lang
	htdocs/langs/is_IS/members.lang
	htdocs/langs/is_IS/orders.lang
	htdocs/langs/is_IS/oscommerce.lang
	htdocs/langs/is_IS/paybox.lang
	htdocs/langs/is_IS/paypal.lang
	htdocs/langs/is_IS/products.lang
	htdocs/langs/is_IS/projects.lang
	htdocs/langs/is_IS/propal.lang
	htdocs/langs/is_IS/sendings.lang
	htdocs/langs/is_IS/shop.lang
	htdocs/langs/is_IS/sms.lang
	htdocs/langs/is_IS/stocks.lang
	htdocs/langs/is_IS/suppliers.lang
	htdocs/langs/is_IS/trips.lang
	htdocs/langs/is_IS/users.lang
	htdocs/langs/is_IS/withdrawals.lang
	htdocs/langs/is_IS/workflow.lang
	htdocs/langs/it_IT/bookmarks.lang
	htdocs/langs/it_IT/cashdesk.lang
	htdocs/langs/it_IT/errors.lang
	htdocs/langs/it_IT/exports.lang
	htdocs/langs/it_IT/externalsite.lang
	htdocs/langs/it_IT/languages.lang
	htdocs/langs/it_IT/paybox.lang
	htdocs/langs/it_IT/paypal.lang
	htdocs/langs/it_IT/projects.lang
	htdocs/langs/it_IT/propal.lang
	htdocs/langs/it_IT/sendings.lang
	htdocs/langs/it_IT/sms.lang
	htdocs/langs/it_IT/workflow.lang
	htdocs/langs/ja_JP/admin.lang
	htdocs/langs/ja_JP/agenda.lang
	htdocs/langs/ja_JP/banks.lang
	htdocs/langs/ja_JP/bills.lang
	htdocs/langs/ja_JP/bookmarks.lang
	htdocs/langs/ja_JP/boxes.lang
	htdocs/langs/ja_JP/cashdesk.lang
	htdocs/langs/ja_JP/categories.lang
	htdocs/langs/ja_JP/commercial.lang
	htdocs/langs/ja_JP/companies.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/ja_JP/deliveries.lang
	htdocs/langs/ja_JP/dict.lang
	htdocs/langs/ja_JP/donations.lang
	htdocs/langs/ja_JP/ecm.lang
	htdocs/langs/ja_JP/errors.lang
	htdocs/langs/ja_JP/exports.lang
	htdocs/langs/ja_JP/externalsite.lang
	htdocs/langs/ja_JP/ftp.lang
	htdocs/langs/ja_JP/help.lang
	htdocs/langs/ja_JP/install.lang
	htdocs/langs/ja_JP/interventions.lang
	htdocs/langs/ja_JP/languages.lang
	htdocs/langs/ja_JP/ldap.lang
	htdocs/langs/ja_JP/mails.lang
	htdocs/langs/ja_JP/main.lang
	htdocs/langs/ja_JP/members.lang
	htdocs/langs/ja_JP/orders.lang
	htdocs/langs/ja_JP/oscommerce.lang
	htdocs/langs/ja_JP/other.lang
	htdocs/langs/ja_JP/paybox.lang
	htdocs/langs/ja_JP/paypal.lang
	htdocs/langs/ja_JP/products.lang
	htdocs/langs/ja_JP/projects.lang
	htdocs/langs/ja_JP/propal.lang
	htdocs/langs/ja_JP/sendings.lang
	htdocs/langs/ja_JP/shop.lang
	htdocs/langs/ja_JP/sms.lang
	htdocs/langs/ja_JP/stocks.lang
	htdocs/langs/ja_JP/suppliers.lang
	htdocs/langs/ja_JP/trips.lang
	htdocs/langs/ja_JP/users.lang
	htdocs/langs/ja_JP/withdrawals.lang
	htdocs/langs/ja_JP/workflow.lang
	htdocs/langs/nb_NO/agenda.lang
	htdocs/langs/nb_NO/banks.lang
	htdocs/langs/nb_NO/bookmarks.lang
	htdocs/langs/nb_NO/boxes.lang
	htdocs/langs/nb_NO/cashdesk.lang
	htdocs/langs/nb_NO/categories.lang
	htdocs/langs/nb_NO/commercial.lang
	htdocs/langs/nb_NO/companies.lang
	htdocs/langs/nb_NO/compta.lang
	htdocs/langs/nb_NO/contracts.lang
	htdocs/langs/nb_NO/deliveries.lang
	htdocs/langs/nb_NO/dict.lang
	htdocs/langs/nb_NO/donations.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/nb_NO/exports.lang
	htdocs/langs/nb_NO/externalsite.lang
	htdocs/langs/nb_NO/ftp.lang
	htdocs/langs/nb_NO/help.lang
	htdocs/langs/nb_NO/install.lang
	htdocs/langs/nb_NO/interventions.lang
	htdocs/langs/nb_NO/languages.lang
	htdocs/langs/nb_NO/ldap.lang
	htdocs/langs/nb_NO/mails.lang
	htdocs/langs/nb_NO/main.lang
	htdocs/langs/nb_NO/members.lang
	htdocs/langs/nb_NO/orders.lang
	htdocs/langs/nb_NO/paybox.lang
	htdocs/langs/nb_NO/paypal.lang
	htdocs/langs/nb_NO/projects.lang
	htdocs/langs/nb_NO/propal.lang
	htdocs/langs/nb_NO/sendings.lang
	htdocs/langs/nb_NO/sms.lang
	htdocs/langs/nb_NO/stocks.lang
	htdocs/langs/nb_NO/suppliers.lang
	htdocs/langs/nb_NO/trips.lang
	htdocs/langs/nb_NO/users.lang
	htdocs/langs/nb_NO/withdrawals.lang
	htdocs/langs/nb_NO/workflow.lang
	htdocs/langs/nl_NL/propal.lang
	htdocs/langs/nl_NL/workflow.lang
	htdocs/langs/pl_PL/agenda.lang
	htdocs/langs/pl_PL/banks.lang
	htdocs/langs/pl_PL/bookmarks.lang
	htdocs/langs/pl_PL/boxes.lang
	htdocs/langs/pl_PL/cashdesk.lang
	htdocs/langs/pl_PL/categories.lang
	htdocs/langs/pl_PL/commercial.lang
	htdocs/langs/pl_PL/companies.lang
	htdocs/langs/pl_PL/compta.lang
	htdocs/langs/pl_PL/contracts.lang
	htdocs/langs/pl_PL/deliveries.lang
	htdocs/langs/pl_PL/dict.lang
	htdocs/langs/pl_PL/donations.lang
	htdocs/langs/pl_PL/errors.lang
	htdocs/langs/pl_PL/exports.lang
	htdocs/langs/pl_PL/externalsite.lang
	htdocs/langs/pl_PL/ftp.lang
	htdocs/langs/pl_PL/install.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pl_PL/languages.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/members.lang
	htdocs/langs/pl_PL/orders.lang
	htdocs/langs/pl_PL/other.lang
	htdocs/langs/pl_PL/paybox.lang
	htdocs/langs/pl_PL/paypal.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/pl_PL/propal.lang
	htdocs/langs/pl_PL/sendings.lang
	htdocs/langs/pl_PL/sms.lang
	htdocs/langs/pl_PL/stocks.lang
	htdocs/langs/pl_PL/suppliers.lang
	htdocs/langs/pl_PL/trips.lang
	htdocs/langs/pl_PL/users.lang
	htdocs/langs/pl_PL/withdrawals.lang
	htdocs/langs/pl_PL/workflow.lang
	htdocs/langs/pt_PT/cashdesk.lang
	htdocs/langs/ro_RO/agenda.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bookmarks.lang
	htdocs/langs/ro_RO/boxes.lang
	htdocs/langs/ro_RO/cashdesk.lang
	htdocs/langs/ro_RO/commercial.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/contracts.lang
	htdocs/langs/ro_RO/deliveries.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/donations.lang
	htdocs/langs/ro_RO/errors.lang
	htdocs/langs/ro_RO/exports.lang
	htdocs/langs/ro_RO/externalsite.lang
	htdocs/langs/ro_RO/interventions.lang
	htdocs/langs/ro_RO/languages.lang
	htdocs/langs/ro_RO/mails.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/members.lang
	htdocs/langs/ro_RO/orders.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/paybox.lang
	htdocs/langs/ro_RO/paypal.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ro_RO/propal.lang
	htdocs/langs/ro_RO/sendings.lang
	htdocs/langs/ro_RO/sms.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/langs/ro_RO/users.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/ro_RO/workflow.lang
	htdocs/langs/ru_RU/agenda.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/bookmarks.lang
	htdocs/langs/ru_RU/boxes.lang
	htdocs/langs/ru_RU/companies.lang
	htdocs/langs/ru_RU/compta.lang
	htdocs/langs/ru_RU/contracts.lang
	htdocs/langs/ru_RU/errors.lang
	htdocs/langs/ru_RU/exports.lang
	htdocs/langs/ru_RU/externalsite.lang
	htdocs/langs/ru_RU/install.lang
	htdocs/langs/ru_RU/mails.lang
	htdocs/langs/ru_RU/main.lang
	htdocs/langs/ru_RU/members.lang
	htdocs/langs/ru_RU/orders.lang
	htdocs/langs/ru_RU/paybox.lang
	htdocs/langs/ru_RU/paypal.lang
	htdocs/langs/ru_RU/propal.lang
	htdocs/langs/ru_RU/stocks.lang
	htdocs/langs/ru_UA/main.lang
	htdocs/langs/sl_SI/agenda.lang
	htdocs/langs/sl_SI/boxes.lang
	htdocs/langs/sl_SI/cashdesk.lang
	htdocs/langs/sl_SI/companies.lang
	htdocs/langs/sl_SI/compta.lang
	htdocs/langs/sl_SI/contracts.lang
	htdocs/langs/sl_SI/dict.lang
	htdocs/langs/sl_SI/errors.lang
	htdocs/langs/sl_SI/exports.lang
	htdocs/langs/sl_SI/externalsite.lang
	htdocs/langs/sl_SI/install.lang
	htdocs/langs/sl_SI/languages.lang
	htdocs/langs/sl_SI/mails.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/sl_SI/members.lang
	htdocs/langs/sl_SI/orders.lang
	htdocs/langs/sl_SI/paybox.lang
	htdocs/langs/sl_SI/paypal.lang
	htdocs/langs/sl_SI/propal.lang
	htdocs/langs/sl_SI/sendings.lang
	htdocs/langs/sl_SI/stocks.lang
	htdocs/langs/sl_SI/suppliers.lang
	htdocs/langs/sv_SE/admin.lang
	htdocs/langs/sv_SE/agenda.lang
	htdocs/langs/sv_SE/banks.lang
	htdocs/langs/sv_SE/bookmarks.lang
	htdocs/langs/sv_SE/boxes.lang
	htdocs/langs/sv_SE/cashdesk.lang
	htdocs/langs/sv_SE/categories.lang
	htdocs/langs/sv_SE/commercial.lang
	htdocs/langs/sv_SE/companies.lang
	htdocs/langs/sv_SE/compta.lang
	htdocs/langs/sv_SE/contracts.lang
	htdocs/langs/sv_SE/deliveries.lang
	htdocs/langs/sv_SE/dict.lang
	htdocs/langs/sv_SE/donations.lang
	htdocs/langs/sv_SE/ecm.lang
	htdocs/langs/sv_SE/errors.lang
	htdocs/langs/sv_SE/exports.lang
	htdocs/langs/sv_SE/externalsite.lang
	htdocs/langs/sv_SE/ftp.lang
	htdocs/langs/sv_SE/help.lang
	htdocs/langs/sv_SE/install.lang
	htdocs/langs/sv_SE/interventions.lang
	htdocs/langs/sv_SE/languages.lang
	htdocs/langs/sv_SE/ldap.lang
	htdocs/langs/sv_SE/mails.lang
	htdocs/langs/sv_SE/main.lang
	htdocs/langs/sv_SE/members.lang
	htdocs/langs/sv_SE/orders.lang
	htdocs/langs/sv_SE/oscommerce.lang
	htdocs/langs/sv_SE/other.lang
	htdocs/langs/sv_SE/paybox.lang
	htdocs/langs/sv_SE/paypal.lang
	htdocs/langs/sv_SE/products.lang
	htdocs/langs/sv_SE/projects.lang
	htdocs/langs/sv_SE/propal.lang
	htdocs/langs/sv_SE/sendings.lang
	htdocs/langs/sv_SE/shop.lang
	htdocs/langs/sv_SE/sms.lang
	htdocs/langs/sv_SE/stocks.lang
	htdocs/langs/sv_SE/suppliers.lang
	htdocs/langs/sv_SE/trips.lang
	htdocs/langs/sv_SE/users.lang
	htdocs/langs/sv_SE/withdrawals.lang
	htdocs/langs/sv_SE/workflow.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/banks.lang
	htdocs/langs/zh_CN/bookmarks.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/cashdesk.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/deliveries.lang
	htdocs/langs/zh_CN/dict.lang
	htdocs/langs/zh_CN/donations.lang
	htdocs/langs/zh_CN/ecm.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/externalsite.lang
	htdocs/langs/zh_CN/ftp.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/languages.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/oscommerce.lang
	htdocs/langs/zh_CN/paybox.lang
	htdocs/langs/zh_CN/paypal.lang
	htdocs/langs/zh_CN/projects.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/sendings.lang
	htdocs/langs/zh_CN/shop.lang
	htdocs/langs/zh_CN/sms.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/trips.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_CN/withdrawals.lang
	htdocs/langs/zh_CN/workflow.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/bookmarks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/cashdesk.lang
	htdocs/langs/zh_TW/deliveries.lang
	htdocs/langs/zh_TW/ecm.lang
	htdocs/langs/zh_TW/externalsite.lang
	htdocs/langs/zh_TW/oscommerce.lang
	htdocs/langs/zh_TW/paypal.lang
	htdocs/langs/zh_TW/shop.lang
	htdocs/langs/zh_TW/sms.lang
	htdocs/langs/zh_TW/trips.lang
	htdocs/langs/zh_TW/withdrawals.lang
	htdocs/langs/zh_TW/workflow.lang
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/members/sync_members_ldap2dolibarr.php
 2013-07-24 15:51:50 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Florian Henry
0ce833d282 Fix bug export contact extrafields 2013-07-24 15:19:05 +02:00
Juanjo Menent
9babb6cc4a Merge pull request #1129 from FHenry/3.4 
Fix bug export contact extrafields
 2013-07-24 06:18:00 -07:00
Laurent Destailleur
7cf429d238 Fix: Color change on page break. 2013-07-24 15:04:09 +02:00
Laurent Destailleur
cc83ad0b0e Merge remote-tracking branch 'origin/3.4' into develop 2013-07-24 14:15:35 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
Laurent Destailleur
2f2f2b66c4 Fix: creation of thumbs not working 2013-07-24 11:26:09 +02:00
BENKE Charles
34c09c3aa5 Update pdf_blochet.class.php 
add ref_ext on pdf output if not empty
 2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24 Merge pull request #1127 from csalvador/taskpdffix 
fix pdf model import
 2013-07-24 01:30:55 -07:00
Laurent Destailleur
644f5149e4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-24 00:42:28 +02:00
Laurent Destailleur
30cd4aeced Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-23 18:37:09 +02:00
Laurent Destailleur
71634a0c76 Fix: Add missing css style 2013-07-23 18:36:18 +02:00
Laurent Destailleur
91debb5b82 Merge pull request #1125 from csalvador/formfile 
added permission to the hook parameters to make it easier to check
 2013-07-23 09:32:12 -07:00
Laurent Destailleur
df27538d74 Merge pull request #1122 from FHenry/3.4 
Avoid PHP warning
 2013-07-23 09:31:16 -07:00
Laurent Destailleur
1d81d1f42c Merge pull request #1120 from defrance69/patch-7 
Update modBanque.class.php
 2013-07-23 09:30:53 -07:00
Laurent Destailleur
1596619f2d Merge pull request #1118 from csalvador/bugfix 
instanciation of Facture objects raised errors, deleted them
 2013-07-23 09:27:56 -07:00
Laurent Destailleur
ac2ba9d1f6 Merge pull request #1117 from atm-maxime/mko149 
Task 149 : # of files and notes appears in tab
 2013-07-23 09:26:59 -07:00
Cédric Salvador
35faff04e9 fix pdf model import 2013-07-23 15:59:41 +02:00
Florian Henry
6f262b3a5b Avoid PHP warning 2013-07-23 15:52:41 +02:00
Laurent Destailleur
cbeeb463e2 Fix: Missing tr line 2013-07-23 15:26:35 +02:00
Laurent Destailleur
361f3a638a Fix: W3C 2013-07-23 15:24:34 +02:00
Cédric Salvador
7bd7c5206d added permission to the hook parameters to make it easier to check 2013-07-23 11:05:46 +02:00
BENKE Charles
8c7c3f03d3 Update modBanque.class.php 
Add bordereau ref_ext fields on export
 2013-07-23 05:54:47 +02:00
Cédric Salvador
19dc3ef8da instanciation of Facture objects raised errors, deleted them 2013-07-22 11:51:29 +02:00
Juanjo Menent
e939a4d268 Merge pull request #1116 from FHenry/develop 
Add category contact into left menu entry
 2013-07-22 02:17:52 -07:00
lalaina rasamoelina
4ecc9b30a9 Delete the name of user who are disable in the creation of events 2013-07-22 11:17:45 +02:00
Florian Henry
26894d9749 Fix bug in SQL 2013-07-22 10:17:31 +02:00
Florian Henry
bbacef6815 Add category contact into left menu entry for augeria theme 2013-07-22 10:15:48 +02:00
Juanjo Menent
d7da816258 Merge pull request #1114 from defrance69/patch-5 
Update modBanque.class.php
 2013-07-22 00:05:46 -07:00
Florian Henry
1a8377d847 Add category contact into left menu entry 2013-07-21 10:47:55 +02:00
BENKE Charles
c555c17315 Update modBanque.class.php 
Add Export of check deposit / bill
 2013-07-20 23:47:37 +02:00
Maxime Kohlhaas
da3e711be7 Task 149 : fix dir on company + added # of notes and documents on supplier order, invoice and project 2013-07-20 10:54:38 +02:00
Maxime Kohlhaas
28eb9d07b2 Task 149 : add # of notes and doc in tab + have always last 3 tabs be notes, doc and info 2013-07-20 09:07:10 +02:00
Geoffrey
27e26c872e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
7c24686532 Add good vars for odt generation 2013-07-19 17:27:22 +02:00
Laurent Destailleur
486920958c Fix: Restore error message, but only when required. 2013-07-19 17:19:35 +02:00
Laurent Destailleur
c7aadfcf65 Fix: syntax error 2013-07-19 17:18:44 +02:00
Laurent Destailleur
7aa5daaeaf Merge pull request #1110 from GPCsolutions/noerrorsondocuments 
Avoid printing errors on documents that are fine without
 2013-07-19 07:41:51 -07:00
Laurent Destailleur
91b51f1f58 Fix: Some td cells must not have hover styles. 2013-07-19 15:52:49 +02:00
Laurent Destailleur
ed52dd9636 New: A more responsive desgin for statistic box of home page 
Qual: Hook for statistics now match specifications.
 2013-07-19 15:29:40 +02:00
Raphaël Doursenaud
e119a5c650 Avoid printing errors on documents that are fine without 2013-07-19 15:08:30 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
3896cde299 Removed useless method. Prefer using generic method. 2013-07-19 13:38:57 +02:00
Laurent Destailleur
4d2c80a122 Merge pull request #1107 from atm-maxime/develop 
Add possibility to define dependencies between extra fields lists
 2013-07-19 04:16:27 -07:00
Laurent Destailleur
e06752bc0e Merge pull request #1105 from atm-maxime/mko149 
Task 149 : # of files and notes appears in tab
 2013-07-19 04:14:05 -07:00
Maxime Kohlhaas
efff92fe1c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Laurent Destailleur
c943ef8edb Fix: doxygen 2013-07-18 23:39:29 +02:00
Laurent Destailleur
22f57e3350 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-18 19:02:02 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Maxime Kohlhaas
aff2be1bc0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-18 17:50:51 +02:00
Maxime Kohlhaas
63e6cf5c81 Add possibility to define dependencies between extra lists 2013-07-18 17:42:09 +02:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Maxime Kohlhaas
e0d037dae5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-18 11:06:38 +02:00
Florian Henry
9d942017ee Merge remote-tracking branch 'origin/develop' into develop_T165 2013-07-18 10:56:57 +02:00
Florian Henry
d5731dd310 [ task #165 ] Add export of multiprices 2013-07-18 10:47:08 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
7b97214df5 Merge pull request #1096 from FHenry/develop_categorycontact 
Develop categorycontact
 2013-07-17 08:41:02 -07:00
Laurent Destailleur
df88dc2f23 Use a better variable name 2013-07-17 14:57:20 +02:00
Maxime Kohlhaas
1c4c3285e2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-17 10:11:54 +02:00
Juanjo Menent
8bae6a774d Merge pull request #1095 from atm-maxime/develop 
Fix on turnover reports
 2013-07-16 23:47:56 -07:00
Florian Henry
4fee61beb0 Fix adding email into mailing module 
source_id is already added
 2013-07-16 21:34:24 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Maxime Kohlhaas
a6a058ddae Fix by including lib files 2013-07-16 18:45:40 +02:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices. 
Fix: Error management into supplier invoice validation.
 2013-07-16 18:43:38 +02:00
Laurent Destailleur
efd855b186 Can replace a tag with file into parameter to ouput into list of files. 2013-07-16 17:50:12 +02:00
Maxime Kohlhaas
c0feda4921 Task 149 : added on product 2013-07-16 01:28:24 +02:00
Maxime Kohlhaas
aa8e43cd1b Task 149 : Add number of notes and attached files into tab. Started with thirdparty 2013-07-16 01:09:19 +02:00
Maxime Kohlhaas
c7f3778b90 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-16 00:21:06 +02:00
Laurent Destailleur
2ae1e787c9 Fix: Bad date ranges 
Conflicts:
	scripts/invoices/rebuild_merge_pdf.php
 2013-07-15 21:49:54 +02:00
Laurent Destailleur
e2b63bb8dd Fix: Bad date ranges 2013-07-15 21:47:45 +02:00
Laurent Destailleur
28c28bd217 New: Add option excludethirdparties and onlythirdparties into merge pdf 
scripts.
 2013-07-15 20:56:43 +02:00
Laurent Destailleur
dd10ff8a11 eol 2013-07-15 18:51:56 +02:00
Laurent Destailleur
17f3d98fb3 New: Add option to exclude some thirdparties 2013-07-15 18:44:59 +02:00
Laurent Destailleur
d637212dce Fix: alternative url were sometimes relative to server, sometimes to 
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
 2013-07-15 00:58:40 +02:00
Laurent Destailleur
9c9b81c981 Merge pull request #1092 from atm-maxime/mko862 
Task 862 : ODT on shipment
 2013-07-14 10:21:10 -07:00
Laurent Destailleur
001072d34c Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 18:43:58 +02:00
Laurent Destailleur
6a1446f4dd Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 16:35:02 +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
154cd1fcf9 Fix: Sort on ref for supplier invoice into ged 2013-07-14 01:10:18 +02:00
Laurent Destailleur
460778818c Fix: automatic ecm for supplier invoices 2013-07-14 01:10:11 +02:00
Laurent Destailleur
1e6171ad0e Fix: Sort on ref for supplier invoice into ged 2013-07-14 00:40:22 +02:00
Laurent Destailleur
bbe9778ced Fix: automatic ecm for supplier invoices 2013-07-14 00:09:42 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
7cdc7c0ab2 Fix: Typo 2013-07-13 19:41:27 +02:00
Laurent Destailleur
330d2173be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-13 15:37:30 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
ad8904a4fb Can add a picto onto line of files list. 2013-07-12 15:10:32 +02:00
Laurent Destailleur
7cff7d3250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-11 20:22:21 +02:00
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +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
Laurent Destailleur
807cbe4163 Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-11 09:43:07 +02:00
Laurent Destailleur
c174be7100 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8 Fix: Avoid duplicate div error. 2013-07-10 22:58:53 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Laurent Destailleur
57dbf87d0a Just use print instead of echo, just because echo is not use anuwhere 
else.
 2013-07-10 15:45:16 +02:00
Maxime Kohlhaas
cfc999a06d Merge 2013-07-10 15:44:53 +02:00
Laurent Destailleur
7ee23a9612 Merge pull request #1085 from csalvador/form_attach_new_file_hook 
hook in form_attach_new_file(html.formfile.class.php)
 2013-07-10 06:42:37 -07:00
Cédric Salvador
9619b09e37 rewriting to fit the new way to use hooks 2013-07-10 15:30:49 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Florian Henry
44cd024f89 Fix bug on from_confrim using ajax and radio button question type 2013-07-10 13:10:32 +02:00
Laurent Destailleur
fbf6f150bc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-09 21:41:05 +02:00
Laurent Destailleur
f67e52f42a Start to clean hook code 2013-07-09 21:40:45 +02:00
Laurent Destailleur
1bff25bf28 Start to clean hookmanager code. 2013-07-09 21:33:45 +02:00
Cédric Salvador
03ad72a1fa fix dol_buildpath failing when processing path such as file.php?id=__ID__ 2013-07-09 18:14:50 +02:00
Cédric Salvador
2fc07d05e9 hook in form_attach_new_file(html.formfile.class.php) 2013-07-09 18:12:43 +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
Florian Henry
3db195cb48 [ bug #971 ] html.form.class.php select_contact with autocomplete do not 
exclude id from exclude array
 2013-07-08 12:51:17 +02:00
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
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
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
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
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
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
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
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
1beb50e870 Fix: State for turkey 2013-07-02 09:58:09 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +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
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
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
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
jfefe
162fc6e6dd Remove debug info 2013-06-27 13:45:06 +02:00
jfefe
2f6361658a Can choose several fields to display with extrafield list of table 2013-06-27 13:35:28 +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
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
9b235f6879 Fix: Remove space at end of binary files 2013-06-26 02:05:18 +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
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
simnandez
ca190be382 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:21:56 +02:00
simnandez
065b30f0d0 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:12:21 +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
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
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
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
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
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
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
Laurent Destailleur
7e748f26a6 Fix: all forms must react same way with option optimize_small_screen 2013-06-20 16:39:17 +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
aaad4d3474 Fix: Menu cheque depends on bank module and not invoice. 2013-06-19 19:52:20 +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
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
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
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
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
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
c45cd3aa1c Fix: Tab must not always be visible 2013-06-18 21:44:18 +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
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
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
Florian Henry
f2e2815cc1 Merge branch 'develop' into dev_projecthtmlform 2013-06-15 11:56:45 +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
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
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
93c71d00f7 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/class/hookmanager.class.php
 2013-06-12 22:17:15 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Laurent Destailleur
0b35217481 Start to debug/fix module IPP 2013-06-12 11:35:30 +02:00
Laurent Destailleur
0c9bc2ac5f Merge branch 'develop' of https://github.com/frederic34/dolibarr into 
frederic34-develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2013-06-12 10:47:56 +02:00
Florian Henry
b4485efdeb Merge branch 'develop' into develop_926_927_928 
Conflicts:
	htdocs/core/class/extrafields.class.php

Change-Id: Ia54e1be6954bc28f81122e88e398bda8059ab536
 2013-06-11 21:41:57 +02:00
Laurent Destailleur
897d1251c8 Fix: Better fix for cleaning vars (i'm tired today) 2013-06-11 12:10:02 +02:00
Laurent Destailleur
40cd45c166 Fix: Better fix for cleaning vars 2013-06-11 12:01:12 +02:00
Laurent Destailleur
8f3ba0dacc Fix: Better fix for cleaning vars 2013-06-11 11:49:59 +02:00
Laurent Destailleur
4326bfb606 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/tr_TR/admin.lang
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/banks.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/bookmarks.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/cashdesk.lang
	htdocs/langs/tr_TR/categories.lang
	htdocs/langs/tr_TR/commercial.lang
	htdocs/langs/tr_TR/companies.lang
	htdocs/langs/tr_TR/compta.lang
	htdocs/langs/tr_TR/contracts.lang
	htdocs/langs/tr_TR/deliveries.lang
	htdocs/langs/tr_TR/dict.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ecm.lang
	htdocs/langs/tr_TR/errors.lang
	htdocs/langs/tr_TR/exports.lang
	htdocs/langs/tr_TR/externalsite.lang
	htdocs/langs/tr_TR/ftp.lang
	htdocs/langs/tr_TR/help.lang
	htdocs/langs/tr_TR/holiday.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/interventions.lang
	htdocs/langs/tr_TR/languages.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/mailmanspip.lang
	htdocs/langs/tr_TR/mails.lang
	htdocs/langs/tr_TR/main.lang
	htdocs/langs/tr_TR/margins.lang
	htdocs/langs/tr_TR/members.lang
	htdocs/langs/tr_TR/orders.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/other.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/products.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/tr_TR/propal.lang
	htdocs/langs/tr_TR/sendings.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/sms.lang
	htdocs/langs/tr_TR/stocks.lang
	htdocs/langs/tr_TR/suppliers.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/tr_TR/users.lang
	htdocs/langs/tr_TR/withdrawals.lang
	htdocs/langs/tr_TR/workflow.lang
 2013-06-11 10:43:36 +02:00
Laurent Destailleur
5f9f709a70 Fix: vars must be cleaned for next call 2013-06-11 10:21:28 +02:00
Regis Houssin
d9f2ad4ff4 Revert "Fix: hookmanager code" 
This reverts commit 89c3cfec3a.
 2013-06-11 09:36:39 +02:00
Laurent Destailleur
1c8edb9cb5 Use currency symbol instead of text 2013-06-11 02:06:34 +02:00
Laurent Destailleur
f4fd71d1f9 Fix: Bad position of currency for USD 2013-06-11 02:05:40 +02:00
Laurent Destailleur
1f95c5d59f Revert "Fix: hookmanager code" 
This reverts commit 2bdf900db9.
 2013-06-11 00:08:15 +02:00
Regis Houssin
2bdf900db9 Fix: hookmanager code 
Conflicts:
	htdocs/core/lib/pdf.lib.php

Change-Id: I4dac5a939abdcbe60fcd1bb21465fabde1324089
 2013-06-10 19:51:07 +02:00
Regis Houssin
89c3cfec3a Fix: hookmanager code 2013-06-10 19:46:37 +02:00
Laurent Destailleur
482a771e7c Fix: Some quality fixes 2013-06-10 19:04:04 +02:00
Laurent Destailleur
48b33a7678 Merge pull request #1036 from defrance69/patch-20 
Create html.formcontract.class.php
 2013-06-10 09:06:41 -07:00
Laurent Destailleur
a925d8d535 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-10 17:01:24 +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
Florian Henry
4f43ec0acf Add extrafield tables 2013-06-10 14:13:44 +02:00
BENKE Charles
6167fedff8 Create html.formcontract.class.php 
Add select_contract function who create à lisbox of contract
 2013-06-09 22:08:05 +03:00
Laurent Destailleur
b8f721092f Removed useless comments 2013-06-09 18:36:47 +02:00
Laurent Destailleur
0aab0cca75 Fix doxygen 2013-06-09 18:29:06 +02:00
Laurent Destailleur
88291e423f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 18:24:52 +02:00
Laurent Destailleur
f78240c067 Doxygen 2013-06-09 18:24:30 +02:00
Florian Henry
4f438224d7 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-09 16:56:47 +02:00
Florian Henry
646be9b984 Fix bug on extrafeild type price and double 2013-06-09 16:56:29 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.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/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
49d65e5ebe Fix: criteria of select 2013-06-09 03:10:31 +02:00
Marcos García
f0454926c2 Fix bug #933: Ajax error 
Caused by commit 7e53f98
 2013-06-08 22:29:18 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Laurent Destailleur
5a77828e62 New: Add object_hour as substitution tag for opendocument generation. 2013-06-08 18:12:32 +02:00
Laurent Destailleur
bd4ca9f1ed Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Laurent Destailleur
2c71c898eb Fix: param lang not provided to price function 2013-06-08 15:21:47 +02:00
Laurent Destailleur
319295554d Fix: Free memory after request 2013-06-08 00:52:02 +02:00
Laurent Destailleur
9fae9da6a1 Fix: proxy was not used everywhere, timeout was not set everywhere. 2013-06-07 20:09:15 +02:00
Laurent Destailleur
c3f5e0c6ee New: Show version of client lib used by mysql drivers 2013-06-07 19:19:11 +02:00
Laurent Destailleur
421c3fb35b Fix: Bad param 'zone' into printCommon 2013-06-07 13:41:32 +02:00
Laurent Destailleur
35fbc9b066 - New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO. 2013-06-07 12:43:41 +02:00
Laurent Destailleur
693f4f3b8b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.

Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-06-06 21:25:10 +02:00
Laurent Destailleur
21c6d42d82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-06 21:19:03 +02:00
Laurent Destailleur
31fe378f3b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.
 2013-06-06 21:18:50 +02:00
Cédric Salvador
8ad2fad817 fixed select_thirdparty_list call in the select_company function 2013-06-06 18:31:52 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
b7f697e8c4 Remove a call of a deprecated function 2013-06-05 22:27:02 +02:00
Laurent Destailleur
7e53f98baa Qual: Uniformize code 2013-06-05 22:01:35 +02:00
Laurent Destailleur
52407f88c4 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 21:59:23 +02:00
Laurent Destailleur
61d5359f23 Fix: Uniformize menu entries 2013-06-05 21:55:51 +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
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
c6c4a83850 Fix: Removed deprecated code fo local tax type 7 since we can use now 
the fiscal stamp that is a better implementation.
 2013-06-04 12:04:04 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
1aa5535741 New: Add function to get http content 2013-06-03 17:44:55 +02:00
Laurent Destailleur
c1dd2f20cd Qual: Clean code. 2013-06-03 15:18:36 +02:00
Laurent Destailleur
1ff175f14e Fix: Bad regex 2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c Fix: Loading of boxes from external modules 2013-06-03 12:43:14 +02:00
Laurent Destailleur
7dc984fd6f Fix: Loading of boxes from external modules 2013-06-03 11:33:13 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Laurent Destailleur
c5783215c4 Fix: Var not initialized 
Fix: Pb of duplicate run of javascript with jmobile
 2013-06-01 23:46:36 +02:00
Laurent Destailleur
8348596aea Fix: Var not initialized 
Fix: Pb of duplicate run of javascript with jmobile
 2013-06-01 23:45:03 +02:00
Laurent Destailleur
b3b80701fd Fix: Bug with jmobile 2013-06-01 02:03:19 +02:00
Laurent Destailleur
743da5a214 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.

Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-05-31 21:33:48 +02:00
Laurent Destailleur
92346296f0 Doxygen 2013-05-31 21:17:49 +02:00
Laurent Destailleur
a85fea9317 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.
 2013-05-31 21:03:24 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error 
Fix: Bad field param
 2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e Fix: Bad param used 2013-05-31 16:35:32 +02:00
Laurent Destailleur
5254f102ba Fix: Solve duplicate js and solve jmobile problem of cache. 2013-05-31 16:34:02 +02:00
Laurent Destailleur
ba6d82686f Fix: Menu dictionnary 2013-05-31 14:54:10 +02:00
Laurent Destailleur
0ec32afd8d Fix: syntax error 
Fix: Bad field param
 2013-05-31 13:30:24 +02:00
Laurent Destailleur
c285f81844 Fix: Bad param used 2013-05-31 13:21:01 +02:00
Laurent Destailleur
da40c460bb Fix: Solve duplicate js and solve jmobile problem of cache. 2013-05-31 10:56:48 +02:00
simnandez
7fa0d6cffa Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 18:00:08 +02:00
simnandez
5fa2598a6f Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 17:58:48 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Laurent Destailleur
b36a10babf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-29 21:05:48 +02:00
simnandez
4f9b5883df Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:18:24 +02:00
simnandez
00395c87a8 Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:17:39 +02:00
Laurent Destailleur
e6c93424ce Qual: Normalized tabs 2013-05-29 15:41:59 +02:00
Laurent Destailleur
b2600e8880 Fix: Missing trans 2013-05-29 02:20:30 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d Fix: But siwtiching to auguria menu. 2013-05-29 01:24:57 +02:00
Laurent Destailleur
9ab8f4c6a3 Merge pull request #998 from FHenry/develop 
Develop
 2013-05-28 15:23:29 -07:00
Laurent Destailleur
b87350e2d6 Merge pull request #994 from defrance69/patch-13 
Update modSociete.class.php
 2013-05-28 15:09:45 -07:00
Florian Henry
8a726ab51b Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-28 21:51:11 +02:00
Florian Henry
23c25066d3 Change comment on dol_include_once 2013-05-28 17:54:55 +02:00
Florian Henry
3ddb410e2e Change comment on dol_include_once method 2013-05-28 17:53:56 +02:00
BENKE Charles
aa06a0b113 Update modSociete.class.php 
enhance filter on export of contact
add postorfunction field in export of contact
 2013-05-28 15:37:08 +02:00
Laurent Destailleur
dc7b4ebc79 Fix: But siwtiching to auguria menu. 2013-05-28 13:54:29 +02:00
Florian Henry
f543f00024 Fix PGSQL Bugs 
Removing parenthesis make query works for MySQL and PgSQL
 2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222 Fix [ bug #911 ] Reorder intervention do not work 2013-05-26 10:15:43 +02:00
Laurent Destailleur
2005ce8d6e Fix: Error with jmobile 2013-05-26 05:02:46 +02:00
Laurent Destailleur
f3f4dec96e Fix: Error with jmobile 2013-05-26 05:01:28 +02:00
Laurent Destailleur
2cac1f4c9c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2013-05-25 18:14:15 +02:00
Laurent Destailleur
7b13be4653 Merge pull request #978 from atm-maxime/3.4 
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
 2013-05-25 01:59:15 -07:00
Laurent Destailleur
e8f72fd401 Merge pull request #979 from defrance69/patch-9 
Update modFournisseur.class.php
 2013-05-25 01:52:30 -07:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
BENKE Charles
ed67173734 Update modFournisseur.class.php 
Add filter feature on the commande export
 2013-05-24 16:17:36 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00
Maxime Kohlhaas
f66750d5e7 Fix : Reset every month with @99 was not working properly (for 3.4 branch) 2013-05-24 11:23:56 +02:00
Maxime Kohlhaas
53c6638a90 Reset every month with @99 was not working properly. 2013-05-23 11:07:56 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Lukas Prömer
bb42f8384b Fix: 'rights' instead of 'right' 2013-05-22 16:31:50 +02:00
Lukas Prömer
f1d9a6545c Fix: 'rights' instead of 'right' 2013-05-22 14:59:21 +02:00
Laurent Destailleur
469ae91e70 Fix: regression 2013-05-22 12:02:39 +02:00
Laurent Destailleur
edf00db0e0 Merge pull request #970 from FHenry/develop 
Add generic behaviour in showphoto of html.form.class.php
 2013-05-22 02:57:21 -07:00
Laurent Destailleur
1109527528 Merge pull request #968 from FHenry/3.3 
3.3
 2013-05-22 02:56:06 -07:00
Laurent Destailleur
f21b149361 Merge pull request #969 from FHenry/3.4 
Fix bug in DDLCreateTable
 2013-05-22 02:55:26 -07:00
fhenry
40827a7ef3 Add generic behaviour in showphoto of html.form.class.php 2013-05-21 14:52:39 +02:00
fhenry
b36a16ed43 Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1 2013-05-21 14:32:30 +02:00
fhenry
13ad88832c Fix bug in DDLCreateTable 2013-05-21 14:31:39 +02:00
fhenry
f08ce6d96a Fix bug on DDLCreateDb in Mysql 2013-05-21 14:28:42 +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
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Juanjo Menent
a7e0f8cb8e Merge pull request #958 from atm-maxime/develop 
Add mobile phone in contact export
 2013-05-19 02:54:44 -07:00
fhenry
6190dddac9 GetElmentURL fichinter instead of ficheinter (to be ok with element of 
fichinter class
 2013-05-19 11:30:35 +02:00
fhenry
181ce52223 Add ficheinter in GetElementURL for action 2013-05-18 22:17:46 +02:00
fhenry
cbf29e20a2 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 13:00:36 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
simnandez
eb7254cccb Fix: Remove windows CR/LF 2013-05-18 09:19:03 +02:00
simnandez
e2f2ad30ae Fix: Remove windows CR/LF 2013-05-18 09:15:18 +02:00
simnandez
2879a09a03 Fix: Remove windows CR/LF 2013-05-18 09:11:24 +02:00
fhenry
1c1736fa20 Fix bad Warning: Bad formed request converted PGSQL 2013-05-17 19:30:48 +02:00
Maxime Kohlhaas
57212d7db8 Add mobile phone in contact export 2013-05-17 17:29:41 +02:00
Christophe Battarel
e3615d43bd fix bug : external users should not see costprice and margin infos 2013-05-17 15:02:27 +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
fdd8d2cc5e Fix: to large a href 2013-05-17 01:30:39 +02:00
Laurent Destailleur
393ad1447a Qual: Uniformize permission code between viewimage.php and document.php 2013-05-16 15:46:54 +02:00
Laurent Destailleur
658f0af428 Fix: Removed warning 2013-05-16 15:13:08 +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
bae17bc39b Fix: Removed warning 2013-05-16 12:37:46 +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
ff94849b0c Fix: Security test 2013-05-15 19:57:51 +02:00
Laurent Destailleur
49735b8d39 New: Add option "filter=bank" onto script rebuild_merge_pdf.php to 
merge PDF that has one payment on a specific bank account.
 2013-05-15 17:52:56 +02:00
fhenry
721e074072 Better wulity code for Task 532 2013-05-15 14:25:33 +02:00
fhenry
be525ad0e8 Better code quality for [ task #531 ] Add a duration on tasks 2013-05-15 14:19:16 +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
96dc851161 Doxygen 2013-05-15 13:24:18 +02:00
Laurent Destailleur
f6dfcb756c Text cells must be left align into excel 2007 export. 2013-05-14 23:54:22 +02:00
fhenry
7de861eee4 Beteer display 2013-05-14 20:30:18 +02:00
fhenry
6727ab34ed Review style hideonsmartphone 2013-05-14 20:25:34 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
Regis Houssin
047aa8ea29 Fix: avoid error when multiple files uploaded 2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b Fix: avoid error when multiple files uploaded 2013-05-14 15:58:59 +02:00
Regis Houssin
179fc0a4cb Fix: avoid error when multiple files uploaded 2013-05-14 15:58:20 +02:00
Laurent Destailleur
551bcba826 Fix: Try to avoid warning 2013-05-14 10:51:09 +02:00
fhenry
f98442d700 Remove the option into admin screen 2013-05-14 09:24:05 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
 2013-05-14 01:15:05 +02:00
Laurent Destailleur
d5cc106a3a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:04:10 +02:00
Laurent Destailleur
ea4b324e25 Merge pull request #943 from defrance69/patch-7 
Update dolgraph.class.php
 2013-05-13 15:41:36 -07:00
Laurent Destailleur
273fbdfa0e Merge pull request #942 from FHenry/3.4 
Remove warning if FetchObjectLinked call
 2013-05-13 15:38:28 -07:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00
fhenry
760ae88f39 [ task #531 ] Add a duration on tasks 2013-05-13 17:08:36 +02:00
Laurent Destailleur
df6c796413 Fix: [ bug #889 ] Titre civilité ne s'affiche 2013-05-12 17:09:48 +02:00
fhenry
111fc3153b Fix Extrafield selllist bug in PgSQL 2013-05-12 15:45:23 +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
fhenry
ccb60e549a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-11 15:48:49 +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
Laurent Destailleur
711e7bf9ad Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/adherents/fiche.php
	htdocs/core/lib/functions.lib.php
 2013-05-11 15:18:52 +02:00
Laurent Destailleur
8a90598b23 Fix: Escape entities 2013-05-11 15:12:42 +02:00
Laurent Destailleur
526a80dd20 Sec: Param not escaped 
Fix: Bad return error
 2013-05-11 15:04:17 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
BENKE Charles
4f28c3dd41 Update dolgraph.class.php 
jflot can't manage more than 2 bars but can manage more than 3 lines.
 2013-05-11 00:13:27 +03:00
fhenry
1a7a8817be Update wrong comment 2013-05-10 18:40:19 +02:00
fhenry
0d13b8d194 Fix previous bug 2013-05-10 18:35:19 +02:00
fhenry
4bb6bd8697 Order result fetchObjectLinked by sourcetype 2013-05-10 18:23:13 +02:00
fhenry
3a05d6c641 Remove warning if FetchObjectLinked call 2013-05-10 17:50:14 +02:00
fhenry
8542a4fd28 Fix date extrafield message old datetimeformat use message in log 2013-05-10 16:34:14 +02:00
Laurent Destailleur
9b30f116f1 Fix: Some lib missing when jmobile enabled. 2013-05-10 12:48:11 +02:00
Laurent Destailleur
ce6e1dc2a6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-09 23:35:04 +02:00
Laurent Destailleur
cc500cceba Fix: form into table is not W3C (broken with some uncommon browsers). 2013-05-09 22:39:31 +02:00
Laurent Destailleur
28c4f9af61 Merge pull request #933 from FHenry/3.4 
Make constraint SQL unique name (Mandatory for PgSQL)
 2013-05-08 00:12:54 -07:00
Laurent Destailleur
68f3a634b6 Merge pull request #932 from marcosgdf/minor 
Removed innecesary whitespace when no picto is displayed
 2013-05-08 00:11:58 -07:00
fhenry
207f6cea28 Fix [ bug #883 ] Silent pgsql errors in comm/index.php 2013-05-07 16:59:27 +02:00
fhenry
16e06736e6 Fix bug [ bug #882 ] [3.4.0] Can't open WithdrawalReceipt / fichier de 
prélèvement
 2013-05-07 16:50:27 +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
70dedc49b2 [ task #877 ] Reorganize menus. Works with auguria menu 2013-05-07 10:15:49 +02:00
Marcos García
c81cf6364a Removed innecesary whitespace when no picto is displayed 2013-05-06 22:59:50 +02:00
Juanjo Menent
3bbde9b8e4 Merge pull request #918 from FHenry/develop 
Fix margin calculation problem, and add myuser_fullname and myuser_logo
 2013-05-06 07:01:38 -07:00
fhenry
bdb81803bd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-04 09:06:32 +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
1c9caeb0d3 Fix: CRLF 2013-05-03 18:33:23 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
c8ef07a889 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-03 16:14:27 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +02:00
fhenry
d8f1818f86 Fix margin calculation problem, and add myuser_fullname and myuser_logo 
into standard ODT replacement
 2013-05-03 15:44:35 +02:00
Laurent Destailleur
b7f3f07fc7 Fix: [ bug #840 ] fichetwothirdright 65% to 55% 2013-05-03 12:13:10 +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
2e4c73ebc4 Fix: Link to phone with tel: must be only onto terminal that support 
protocol "tel:"
 2013-05-03 10:06:54 +02: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
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
77956a5676 Merge pull request #911 from atm-maxime/develop 
Fix : extrafields were save without escape
 2013-05-02 10:43:14 -07:00
Laurent Destailleur
f595a7ed0c Merge pull request #905 from FHenry/develop 
Add table extrafield for commande fournisseur
 2013-05-02 10:41:02 -07:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning 
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
 2013-05-02 17:41:10 +02:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02:00
Maxime Kohlhaas
80cf467c47 Fix : extrafields were save without escape 2013-05-02 12:14:29 +02:00
fhenry
5d60ed2462 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-01 22:57:33 +02:00
fhenry
3b6efd569d Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-05-01 17:09:08 +02:00
Laurent Destailleur
5c95018356 Fix: Avoid empty arrays 2013-05-01 16:00:06 +02:00
fhenry
f3480bf502 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 14:38:43 +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
c84427bd22 Fix: delete of files with [ and glob. 
Conflicts:
	test/phpunit/FilesLibTest.php
 2013-04-30 22:52:56 +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
fhenry
ac6e56f058 Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-04-30 21:10:26 +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
Laurent Destailleur
761b2d05d4 Fix: delete of files with [ and glob. 2013-04-30 17:24:11 +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
Laurent Destailleur
840dcfec38 Fix: Bad detection of PDF format. 2013-04-29 09:25:42 +02:00
Laurent Destailleur
f6c2bd4928 Fix: Uniformize menu conditions 2013-04-28 23:25:28 +02:00
Grand Philippe
63c474e2cc fix: Undefined index 2013-04-28 22:29:50 +02:00
Grand Philippe
c4a064d104 fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired 2013-04-28 19:35:10 +02:00
Laurent Destailleur
670d01e14e Fix: Remove space char at end of document and viewimage. 2013-04-28 18:46:34 +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
Laurent Destailleur
7b85baa5e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-28 01:12:48 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
Laurent Destailleur
4c9a728799 Merge pull request #890 from marcosgdf/translations 
Improved translations
 2013-04-27 12:53:15 -07:00
Laurent Destailleur
07baa244ed No need to make a test on a var 2013-04-27 21:38:49 +02:00
Laurent Destailleur
38bc86dc2a Missing menu entry for home page 2013-04-27 21:37:30 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Laurent Destailleur
24309a7f17 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-27 12:25:22 +02:00
Laurent Destailleur
3203283fe9 Fix: remove warning 2013-04-27 12:24:48 +02:00
Laurent Destailleur
50dd0ef7ee Merge pull request #885 from FHenry/develop 
Review extrafield for compliance with wiki
 2013-04-26 13:08:37 -07: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
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02: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
Regis Houssin
d25687276e Fix: bypass the second test if the first is ok 2013-04-26 16:29:29 +02:00
Regis Houssin
c0a3271d76 Fix: bypass the second test if the first is ok 2013-04-26 16:28:54 +02:00
Regis Houssin
c969d17e48 Fix: avoid error 2013-04-26 16:22:14 +02:00
Regis Houssin
3684271627 Fix: avoid error 2013-04-26 16:21:48 +02:00
Regis Houssin
36e6269b24 Fix: big security problem with multicompany 2013-04-26 16:08:02 +02:00
Regis Houssin
34036c2a5c Fix: big security problem with multicompany 2013-04-26 16:07:35 +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
30ad2f1609 Fix bug in fetch_optionals 2013-04-26 10:51:17 +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
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
fhenry
d0f44bf25f Add zero entity into extrafeild deletion 2013-04-26 08:46:25 +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
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
726c83d2d2 Merge pull request #877 from FHenry/develop 
Fix bug on Extrafield list table type
 2013-04-25 01:23:57 -07:00
Laurent Destailleur
023b6f2e8b Fix: Use entity 2013-04-25 10:22:08 +02:00
Laurent Destailleur
86ea79c860 Fix: dol_check_secure_access_document is also used by viewimage. This 
also solve bug of not found supplier doc and solve some security holes.
 2013-04-25 10:06:54 +02:00
Laurent Destailleur
cce857d6ee Fix: When box is removed, it is added into combo box of available boxes. 2013-04-25 01:35:33 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
8c440b3f57 Remove entity check in list table extrafield 2013-04-25 00:14:43 +02:00
fhenry
507da4fc3b Add Zero entity to shared extrafield 2013-04-25 00:09:47 +02:00
fhenry
f1a97d4705 remove ver_export 2013-04-25 00:02:29 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7fdf2f3482 Fix for php 5 2013-04-24 23:54:02 +02:00
fhenry
928a1afe18 Fix bug on Extrafield list table type 2013-04-24 21:32:22 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
fhenry
7b1616d0c5 Better management extrafield from list of table 2013-04-24 19:14:03 +02:00
fhenry
5789a5d6e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 17:53:59 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
9ce7e44f00 use price method rather than price2num. price are use in all PDF, so it 
should be the same on ODT
 2013-04-24 16:47:15 +02:00
Laurent Destailleur
9a2b72f8f8 Compatibility with jmobile 2013-04-24 15:49:43 +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
d9a2805100 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 08:50:51 +02:00
Laurent Destailleur
d5f3f47782 New: Use div for tabs. 2013-04-24 03:56:13 +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
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock 
fix [ bug #842 ] Erreur SQL Propal
 2013-04-23 14:02:29 +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
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18 Removed warning 2013-04-22 20:45:47 +02:00
Laurent Destailleur
9135fd0272 Merge pull request #868 from jfefe/webservices 
New webservice to retrieve a document (work on invoice, propal, order and generic
 2013-04-22 11:35:35 -07: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
simnandez
de5a57a3c8 Fix: Uniformize creation in orders 2013-04-22 16:23:59 +02:00
fhenry
3fdc57cc56 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-22 16:20:35 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
Regis Houssin
7217d91f13 Fix: missing commit 2013-04-22 15:26:45 +02:00
Regis Houssin
28757c8d88 Fix: missing commit 2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504 Fix: broken features 2013-04-22 15:09:19 +02:00
jfefe
b5e66cc492 Mutualize code for security check when accessing a document by document.php and bywebservice 2013-04-22 15:00:29 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Laurent Destailleur
e65e6516c5 Fix: Logon theme on amarok 2013-04-22 14:33:47 +02:00
Laurent Destailleur
54040bed1d Fix: No slash alone 2013-04-22 12:48:56 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00
Regis Houssin
ab4a3dcaa7 Fix: missing rename field 2013-04-22 10:18:03 +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
9b07271460 Merge pull request #864 from jfefe/doc_ods 
Task [#838] : Can generate ods document on thirdparty
 2013-04-21 16:32:07 -07:00
Laurent Destailleur
11023fa210 Merge pull request #857 from marcosgdf/task-823 
New: [ task #823 ] Shipping_validate email notification
 2013-04-21 16:07:37 -07:00
Laurent Destailleur
e19e0ff557 Fix: Error management 2013-04-22 00:57:56 +02:00
Laurent Destailleur
3f09cbec7e Merge pull request #855 from marcosgdf/minor-refactor 
ECM Refactor
 2013-04-21 15:18:15 -07:00
Laurent Destailleur
9f3164d710 Merge pull request #849 from GPCsolutions/ca_report_improvments 
Improved reports
 2013-04-21 15:13:34 -07:00
Laurent Destailleur
42b3d6e317 Merge pull request #865 from FHenry/develop 
Add extrafield select from table
 2013-04-21 15:12:04 -07:00
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
JF FERRY
642ba10d84 New hidden option to introduce timing value into odt document nam 2013-04-21 17:04:54 +02:00
Laurent Destailleur
f4513d1beb Move option ate better place 2013-04-21 16:01:36 +02:00
JF FERRY
83028b958a Task #838 : retieve extension to work with ods document 2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20 Task #838 - change regex to look at ods document too 2013-04-21 14:55:32 +02:00
Marcos García
82e3a8d0b9 New: [ task #823 ] Shipping_validate email notification 2013-04-21 14:14:30 +02:00
Marcos García
293fc89a9f Missing copyright 2013-04-21 12:45:34 +02:00
Marcos García
17902a8455 Removed var_dump 2013-04-21 12:44:13 +02:00
Marcos García
7befeae371 ECM Refactor 2013-04-21 12:42:58 +02:00
Laurent Destailleur
ab2709f684 Filter on agenda event are autoselected on "manual event". 2013-04-21 12:26:44 +02:00
Laurent Destailleur
a7f169d102 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6 Fix: pgsql compatibility 2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246 Merge pull request #851 from FHenry/develop 
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
 2013-04-20 12:02:16 -07:00
Laurent Destailleur
12caa20e38 Merge pull request #850 from atm-maxime/develop 
Carrier conf modification
 2013-04-20 11:42:44 -07:00
Laurent Destailleur
4d54b8a22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 20:30:48 +02:00
Laurent Destailleur
dd13c334c7 New: Compatibility with jmobile 2013-04-20 20:30:18 +02:00
Laurent Destailleur
2008fd1419 Fix: Optimize for small screen 2013-04-20 17:49:24 +02:00
fhenry
dd8a84bce3 Fix [ bug #833 ] Accounting journals are broken 2013-04-20 13:08:06 +02:00
Maxime Kohlhaas
cf945f0187 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if 
libreoffice/jodconverter/exec shell right)
 2013-04-20 10:44:01 +02:00
Raphaël Doursenaud
f2bd1461b2 Improved reports 
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
 2013-04-20 07:33:10 +02:00
fhenry
62c9366d69 fix debug 2013-04-20 07:21:26 +02:00
fhenry
75194ddb57 Ifo user visibility and maxlength product label regarding db column size 2013-04-20 07:05:31 +02:00
Laurent Destailleur
162ccf68b6 Merge pull request #841 from FHenry/develop 
fix [ bug #825 ] User first name not visible into users->perms
 2013-04-19 17:21:16 -07:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Maxime Kohlhaas
bfb05c78cd Change carrier config into dict instead of dedicated conf page 2013-04-19 20:20:10 +02:00
unknown
8030b39536 fix : undefined variable 2013-04-19 19:45:06 +02:00
Laurent Destailleur
eebbcbec57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-19 19:18:39 +02:00
Laurent Destailleur
bb3f40a1bf Qual: Clean code to be able to update combo box when removing a box. 
Qual: Opensurvey tables
 2013-04-19 15:26:53 +02:00
Laurent Destailleur
08ae1d289b Pgsql compatibility 2013-04-19 15:02:53 +02:00
Laurent Destailleur
570e4391a5 Fix: Box with product out of stocks for pgsql 2013-04-19 14:51:39 +02:00
Regis Houssin
5d7b94f661 Fix: the purchase price, manually entered is not taken recovered 2013-04-19 13:30:08 +02:00
Regis Houssin
077698d789 Fix: for avoid missing the customer discount 2013-04-19 12:47:53 +02:00
Laurent Destailleur
df0b0ebf51 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.
 2013-04-19 09:44:37 +02:00
Laurent Destailleur
ac8868e2d2 Fix: Use correct format for js 2013-04-18 19:56:14 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
Regis Houssin
ebb09db710 Fix: for avoid errors 2013-04-18 11:05:31 +02:00
Juanjo Menent
fa4490ef79 Merge pull request #840 from FHenry/develop 
[ task #741 ] Gestion des interventions/Add intervention box
 2013-04-17 07:59:34 -07:00
Laurent Destailleur
bcacbab481 Qual: No need to use two menu entries for this. 2013-04-17 16:26:14 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Laurent Destailleur
a5deb8e9d7 Fix: bug into is_erasable function. 
Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-04-16 15:54:36 +02:00
Laurent Destailleur
4fe49b6736 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196 Fix: bug into is_erasable function. 2013-04-16 15:00:41 +02:00
fhenry
cba73b238c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal.php

Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
 2013-04-16 11:37:51 +02:00
Laurent Destailleur
9659ecba70 Merge pull request #836 from jfefe/extrafields 
Fix on extrafields date type : do not show current date when field not r...
 2013-04-16 02:33:01 -07:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
51fe0d9e09 Removed duplicate function 2013-04-15 22:26:03 +02:00
jfefe
610fed6b3c Fix on extrafields date type : do not show current date when field not required 2013-04-15 18:42:00 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files. 
Qual: Removed not used library.
Look: Uniformize css.
 2013-04-15 18:00:20 +02:00
Laurent Destailleur
8e1c06f617 Qual: Cleaner menu sources 2013-04-15 15:56:50 +02:00
fhenry
24a6321d45 Fix : Add service date limit transfert from propal to order 2013-04-15 15:55:10 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Laurent Destailleur
36c55971b5 Fix: PHPUnit Regression 2013-04-14 23:57:07 +02:00
Laurent Destailleur
67052933ca Fix: PHPUnit 2013-04-14 23:42:24 +02:00
Laurent Destailleur
a0851ba99f More complete log. 2013-04-14 18:10:02 +02:00
Laurent Destailleur
e4c4cced70 Look: Optimize for small screen 2013-04-14 16:11:55 +02:00
Laurent Destailleur
a5d996de4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-14 14:45:43 +02:00
Laurent Destailleur
f8c3396fa7 Fix: "Now" button was not working when using combo calendar selector. 2013-04-14 14:45:23 +02:00
Laurent Destailleur
22402c38f8 Still working on new menu management. 2013-04-14 14:32:38 +02:00
Juanjo Menent
de19af9e9f Merge pull request #825 from FHenry/develop 
[ task #814 ] Add extrafield feature into Project/project tasks module
 2013-04-14 05:15:17 -07:00
Laurent Destailleur
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
Laurent Destailleur
b86eba7f34 doxygen 2013-04-14 10:50:33 +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
51f444fb8c Look: Optimize title lines 2013-04-14 02:09:41 +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
Laurent Destailleur
38cb9a530f Doxygen 2013-04-14 01:28:43 +02:00
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Laurent Destailleur
fc22489104 Fix: Option SOCIETE_DISABLE_CUSTOMERS not complete 2013-04-13 21:18:41 +02:00
Laurent Destailleur
355168527d Look: Optimize for smartphone 2013-04-13 18:41:43 +02:00
Laurent Destailleur
1a1e09a5ed Qual: Clean and mutualize code. 2013-04-13 18:33:23 +02:00
Laurent Destailleur
20c9370690 New: Support the mode readonly of ckeditor 2013-04-13 16:23:05 +02:00
Laurent Destailleur
6e495bfbe1 Fix: lang loading 2013-04-13 14:38:26 +02:00
Laurent Destailleur
90cfa42915 Fix: removed useless &nbsp; 2013-04-12 19:45:09 +02:00
Laurent Destailleur
62893c2ae4 Qual: uniformize code to use function de set with and height for graphs 2013-04-12 17:08:54 +02:00
Laurent Destailleur
26653a42e4 Optimize for terminal with no_mouse_hover 2013-04-12 16:53:06 +02:00
Laurent Destailleur
97b0076c5a Doxygen 2013-04-12 16:31:16 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
Laurent Destailleur
3238a22afd Fix: Do not show not defined entries 2013-04-12 14:46:48 +02:00
Laurent Destailleur
c9b3193c44 Fix: Hooks with version 3.4 must match specification defined here: 
http://wiki.dolibarr.org/index.php/Hooks_system
So i try a better fix that implement correctly this. To have the
moveFileUpload trigger keeping dolibarr code, it must return 0.
 2013-04-12 13:18:24 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Regis Houssin
9596134e47 Fix: use new method 2013-04-12 10:28:19 +02:00
Regis Houssin
0b2b888584 Fix: use new method 2013-04-12 10:26:52 +02:00
Regis Houssin
85e09a953f Fix: missing return with hook 2013-04-12 10:04:10 +02:00
Regis Houssin
3892a52852 Fix: missing return with hook 2013-04-12 10:00:20 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
Laurent Destailleur
fe20f8ae1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
	htdocs/install/mysql/tables/llx_expedition.key.sql
	htdocs/install/mysql/tables/llx_expedition.sql
 2013-04-11 23:08:10 +02:00
Laurent Destailleur
edcc201305 Fix: not complete renaming 2013-04-11 23:04:25 +02:00
Laurent Destailleur
4876aee493 Fix: Fix bad fix of SOCIETE_CODEFOURNISSEUR_ADDON 2013-04-11 20:32:09 +02:00
Laurent Destailleur
616219c99c Merge pull request #822 from FHenry/develop 
Qual : PHP Code_Sniffer
 2013-04-11 10:14:03 -07:00
fhenry
629ef78dc8 Add subtitution inside header and fotter document 2013-04-11 18:38:50 +02:00
fhenry
2f7be8d2c2 Add hook for substitution 2013-04-11 17:31:24 +02:00
Regis Houssin
662d9cfa6e Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:11:15 +02:00
Regis Houssin
9b2cbfef05 Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:10:11 +02:00
fhenry
6335918d72 Quel : indentation 2013-04-11 17:06:53 +02:00
fhenry
2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
 2013-04-11 10:04:27 +02:00
Laurent Destailleur
792341a4b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-04-11 07:39:16 +02:00
BENKE Charles
e0cb09bd65 Update admin_extrafields.inc.php 
$default_value not initialised
new type : sellist
 2013-04-10 22:38:45 +03:00
Laurent Destailleur
4d0dd0d56c Fix: Function to generate pdf 2013-04-10 20:50:05 +02:00
Laurent Destailleur
9dd201df10 Fix: Log 2013-04-10 20:47:39 +02:00
Laurent Destailleur
15e86875f3 Fix: sql syntax error 2013-04-10 20:45:38 +02:00
fhenry
98ddd02a32 Qual : PHP Code_Sniffer 2013-04-10 19:55:21 +02:00
Laurent Destailleur
70b7cb1fa3 Fix: Restore suffix 2013-04-10 19:50:54 +02:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
740bc2a656 Fix: filter on all contacts, not just those related to a company 2013-04-10 15:59:54 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Regis Houssin
2c51b51a88 Fix: security 2013-04-10 11:56:19 +02:00
Laurent Destailleur
bc1469ff29 Fix: More complete function 2013-04-10 11:03:24 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
Laurent Destailleur
7f6fa0bf0f Fix: Enhance detection of html 2013-04-10 10:40:35 +02:00
Laurent Destailleur
e79d0f50d0 Fix: Regression 2013-04-10 00:08:55 +02:00
Laurent Destailleur
538194f435 New: Add module opensurvey. Final. Test are welcome. 2013-04-09 23:05:50 +02:00
Laurent Destailleur
2ab5c2029d Merge pull request #817 from grandoc/develop 
add supplier invoice extrafields and some fixes
 2013-04-09 12:21:26 -07:00
frederic34
61b4305949 Merge remote-tracking branch 'upstream/develop' into develop 2013-04-09 17:33:09 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +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
Laurent Destailleur
898a3891e8 Merge pull request #814 from grandoc/develop 
fix: wrong url
 2013-04-08 14:26:15 -07:00
Grand Philippe
5b5b57d4e0 some fixes for supplier orders extrafields 2013-04-08 23:20:35 +02:00
Laurent Destailleur
7d2b11aff5 Qual: Remove a deprecated page, replaced by a more direct combo box. 2013-04-08 19:26:45 +02:00
fhenry
6379b74099 Fix bug on ODT template path for order and projects 2013-04-08 18:02:12 +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
a593e5d4e5 fix: wrong url 2013-04-08 11:56:50 +02:00
frederic34
40f11206de Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/commande/fiche.php
 2013-04-08 11:33:45 +02:00
fhenry
52706117d9 Merge branch 'develop' into develop_orderextrafield 2013-04-07 23:54:33 +02:00
fhenry
393007625a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d
 2013-04-07 23:52:02 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +02:00
Laurent Destailleur
5c3e6de073 Qual: Mutualize code. Only one function to build address format. 2013-04-07 17:39:08 +02:00
fhenry
78571e4458 Merge branch 'develop' into develop_orderextrafield 2013-04-07 15:12:27 +02:00
fhenry
0427080a4e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_orderextrafield

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
 2013-04-07 15:11:52 +02:00
fhenry
144ab24545 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
 2013-04-07 15:08:47 +02:00
Laurent Destailleur
64a9689473 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:41:42 +02:00
Laurent Destailleur
fafd426903 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:40:13 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
ee2a2f7b48 Missing space 2013-04-06 16:43:26 +02:00
fhenry
2b0668bf81 Add paiement mode et delay on PDF muscadet 2013-04-06 13:38:32 +02:00
fhenry
9ff559b033 Add wished delivery date into supplier orders PDF muscadet 2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05 Fix order_supplier and invoice_supplier PDF model name 2013-04-06 13:00:41 +02:00
fhenry
cc465380da Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) 2013-04-06 12:20:19 +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
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
Laurent Destailleur
815bb82b0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-05 22:51:19 +02:00
Laurent Destailleur
5f2ea4c65c Merge pull request #804 from atm-maxime/develop 
Fixes on invoice payment list and for price by quantity
 2013-04-05 13:49:52 -07:00
Laurent Destailleur
bbb0854517 Merge pull request #803 from FHenry/3.3 
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
 2013-04-05 13:49:11 -07:00
Laurent Destailleur
a3c5db968e Merge pull request #800 from FHenry/develop 
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
 2013-04-05 13:39:52 -07:00
Laurent Destailleur
a5f72bfb4e Fix: Some fix after patch merge. 2013-04-05 22:38:46 +02:00
Laurent Destailleur
49c9df3688 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-05 22:29:21 +02:00
Laurent Destailleur
7ebd24daea Merge pull request #805 from zedzedtop/develop 
Develop
 2013-04-05 13:28:58 -07:00
Laurent Destailleur
b47765f721 Optimize for smartphones 2013-04-05 22:26:41 +02:00
Laurent Destailleur
1fb3159045 Qual: Uniformize code 2013-04-05 18:09:05 +02:00
Laurent Destailleur
77050340df Fix: Do not loose value dol_use_jmobile when using not connected pages 
(support and forget password)
 2013-04-05 17:50:45 +02:00
Laurent Destailleur
58277b0fff Look: Replace table with div 2013-04-05 17:39:27 +02:00
Laurent Destailleur
ff4c9c495a Fix: Uniformize field names 2013-04-05 13:35:09 +02:00
fhenry
dfcb38d13f [ task #793 ] Add extrafield feature into Orders module 2013-04-05 12:43:00 +02:00
fhenry
dcd960a957 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
 2013-04-05 11:46:09 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
Laurent Destailleur
d8a86453e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136 Optimize size of graph 2013-04-04 21:13:51 +02:00
Maxime Kohlhaas
9530e103e8 Fix : price by quantity now updates the discount field only if there is not an existing discount greater than the price by quantity one 2013-04-04 20:44:00 +02:00
juanjo
61b28274f7 [ bug #790 ] Spanish localtax RE not being correctly calculated 2013-04-04 16:32:06 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
4996a4b217 Fix: regex not complete 2013-04-04 12:23:12 +02:00
Laurent Destailleur
281cd49f32 Merge pull request #798 from lrq3000/develop3 
Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for ...
 2013-04-04 02:36:30 -07: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
Stephen L
cb3f183353 Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2013-04-03 00:57:40 +02:00
Laurent Destailleur
3312e620b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-03 00:37:05 +02:00
Laurent Destailleur
08be243dc4 Optimize with smartphone 2013-04-03 00:36:31 +02:00
fhenry
9572eebae0 Check style 
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde)
 2013-04-02 22:22:57 +02:00
fhenry
735e107a51 Better error management on extrafailed input 2013-04-02 14:12:21 +02:00
fhenry
e93b6141e1 Add translation for extrafield 2013-04-02 12:04:37 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
fhenry
d03fb5d363 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-02 10:53:29 +02:00
fhenry
489d62dbf1 Better extrafield date management 2013-04-02 10:52:39 +02:00
Laurent Destailleur
f98e40f694 Optimize for smartphone 2013-04-02 10:26:11 +02:00
Laurent Destailleur
c8bc0a1ec9 New: Prepare to code to support jmobile. 2013-04-01 23:38:39 +02:00
Laurent Destailleur
aba9fd8fc5 Fix: Nowrap 2013-04-01 23:01:38 +02:00
Laurent Destailleur
29a1640b4c Qual: Normalize field ref_supplier into supplier invoices (replace 
facnumber).
 2013-04-01 22:39:27 +02:00
Laurent Destailleur
cf4603f5af Merge pull request #793 from jfefe/extrafields 
Task #784 : display calendar into data type extrafields / new methods to manage extrafields
 2013-04-01 12:00:08 -07:00
Laurent Destailleur
9449345395 Another step for menu management rewriting 2013-04-01 20:15:52 +02:00
jfefe
cf6f4405cb Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 
Conflicts:
	htdocs/comm/propal.php
 2013-04-01 19:44:55 +02:00
jfefe
ec52f54a52 Unique function to show input or output of extrafields datas 2013-04-01 18:59:05 +02:00
jfefe
6e66922a6b Fix : in extrafield force output for date selector 2013-04-01 18:46:53 +02:00
Laurent Destailleur
3c37f89d2e Work on new menu managers - step x 2013-04-01 16:02:16 +02:00
Laurent Destailleur
e352e4a56f New: Work on new menu management. 2013-03-31 19:54:56 +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
dca3179bfe New: Support __LOGIN__ and __USERID__ on left menu entries 2013-03-30 21:29:14 +01:00
Laurent Destailleur
a5799b3ae8 Trans for SMS 2013-03-30 21:25:00 +01:00
Laurent Destailleur
ef571de960 New: Support __USERID__ into menu entries 2013-03-30 20:34:13 +01:00
Laurent Destailleur
4c1f17f42f Qual: More robust error management for menu description 2013-03-30 19:11:52 +01:00
jfefe
1ab1d74c77 New option (MAIN_EXTRAFIELDS_USE_TWO_COLUMS) to split extrafields display into 2 columns 2013-03-30 17:52:59 +01:00
jfefe
3fe1b26136 New method to CommonObject to display extrafields data output 
Try for product
 2013-03-30 17:43:21 +01:00
Laurent Destailleur
4208f11d87 Enhance fixutf8bomfiles and fixdosfiles tools. 2013-03-30 15:57:54 +01: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
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Laurent Destailleur
3c248ce1fe Merge pull request #790 from jfefe/extrafields 
Work on task #784 : display calendar into data type extrafields
 2013-03-30 05:27:14 -07:00
jfefe
95d8ee8b41 Revert "Show number with dot to avoid error when update extrafield" 
This reverts commit 76efc04840.
 2013-03-30 10:49:52 +01:00
jfefe
60e72a770a Merge branch 'develop' into extrafields 2013-03-29 22:25:48 +01:00
jfefe
649c1f3721 Try new function to set array_options to object (extrafields values) with date sent by forms 2013-03-29 22:25:02 +01:00
BENKE Charles
701814ad19 Update mysqli.class.php 2013-03-29 21:19:22 +01:00
Laurent Destailleur
e40909144d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-29 18:30:05 +01:00
Laurent Destailleur
97a90b0904 New: Add more ODT tags 2013-03-29 16:45:40 +01:00
Laurent Destailleur
ff5b2b3404 Merge pull request #786 from defrance69/patch-21 
Update mysql.class.php
 2013-03-29 08:32:17 -07:00
Laurent Destailleur
4c47393b51 Fix: Add more ODT tags 2013-03-29 16:18:55 +01:00
Laurent Destailleur
8f331adff6 New: Work on men management rewrite 2013-03-29 16:16:26 +01:00
Laurent Destailleur
006050b6cd Fix: left menu not always opened 2013-03-29 15:39:35 +01:00
jfefe
1a1aebf793 Display date extrafield with correct format 2013-03-29 14:56:31 +01:00
jfefe
80f080f5a9 Format date for sql query 
Using dol_print_date because db->idate doesn't work
 2013-03-29 14:45:40 +01:00
jfefe
c53564c454 For extrafield with date type show calendar instead basic input field 2013-03-29 14:03:39 +01:00
jfefe
520e235207 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-03-29 10:44:35 +01:00
BENKE Charles
d5a1f64e76 Update mysql.class.php 
some other problems about DDLCreateTable, other field setting not actived
 2013-03-29 02:09:19 +01:00
Laurent Destailleur
2e3fd0083a Merge pull request #785 from FHenry/develop 
Add more information in ODT project template
 2013-03-28 15:40:46 -07:00
fhenry
c2be118efd Add more information in ODT project template 2013-03-28 20:51:00 +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
4e97a41612 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-28 16:29:22 +01:00
jfefe
ed2b359dae Bad parameter when calling setEventMessage function 2013-03-28 06:48:21 +01:00
Laurent Destailleur
07062065e5 Merge pull request #782 from jfefe/propal_odt_choice 
New : can choose to generate the ODT document according to the status of a propale
 2013-03-27 13:35:34 -07:00
jfefe
013eac1147 Better error management when add/update extrafield 
Usage of setEventMessage() function
 2013-03-27 21:24:45 +01:00
Laurent Destailleur
753bfdbec2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-27 20:43:43 +01:00
Laurent Destailleur
0a3b7e7994 New: Be able to get path of image without tag img 2013-03-27 20:43:28 +01:00
Regis Houssin
55757a6b82 Fix: $i is global 2013-03-27 20:42:55 +01:00
jfefe
0b7d13d463 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-03-27 20:39:56 +01:00
jfefe
1f537300ea Add hidden option MAIN_PROPAL_CHOOSE_ODT_DOCUMENT to enable choice of ODT document to use according to his status 2013-03-27 19:11:42 +01:00
Laurent Destailleur
f27f601a73 Merge pull request #780 from FHenry/develop 
Add information on Project ODT into ODT project
 2013-03-27 07:56:33 -07:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
Laurent Destailleur
a22d39adfb Fix: Hook is a replaceadd hook. 2013-03-27 14:11:15 +01:00
fhenry
9507f4258b Add inforamtion on Project into ODT project 2013-03-26 23:32:22 +01:00
Regis Houssin
e75c609a0a Fix: wrong var name 2013-03-26 18:33:44 +01:00
Regis Houssin
b5d13dc6e6 Fix: missing parameter 2013-03-26 18:33:23 +01:00
Regis Houssin
e9a8457d7e Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 18:33:14 +01:00
Regis Houssin
61826b04d8 Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 18:33:06 +01:00
Regis Houssin
a701cbd77c Fix: wrong var name 2013-03-26 17:47:37 +01:00
Laurent Destailleur
b694451ab2 Use engine instead of type 2013-03-26 17:45:07 +01:00
Regis Houssin
4fe94b800b Fix: missing parameter 2013-03-26 17:43:48 +01:00
Regis Houssin
dff74667c2 Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 17:29:40 +01:00
Regis Houssin
33a82c396e Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 17:12:00 +01:00
BENKE Charles
2c56a1c8dc Update mysql.class.php 
Create Table 'type' not supported on recent mysql databases, need to use 'engine' instead
 2013-03-26 16:49:02 +01:00
frederic34
1cd39df82b Merge remote-tracking branch 'upstream/develop' into develop 2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1 Print IPP 2013-03-26 10:23:00 +01:00
Sébastien de Chateauvieux
28999af70b TVA NPR : set function get_default_npr 2013-03-26 08:47:17 +04: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
9dd4ed9cb8 [ task #770 ] Add ODT document generation for Projects module 2013-03-25 19:28:34 +01:00
BENKE Charles
8b160ac712 Update modAgenda.class.php 
Add export feature of calendar module
 2013-03-25 18:26:35 +01:00
Laurent Destailleur
6a34250712 Rewrite module manager. Next step. 2013-03-25 17:54:54 +01:00
fhenry
7881502b52 [ task #773 ] Add Project document in GED(ECM) modules 2013-03-25 09:56:07 +01:00
Laurent Destailleur
4fb4734eed Merge pull request #772 from grandoc/develop 
fix : trad error
 2013-03-24 15:08:24 -07:00
Laurent Destailleur
4e029bf2ca Fix: Security does not need special case 2013-03-24 21:06:45 +01:00
Laurent Destailleur
b3d4811b6f New: Another method to allow style tags into email. 
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
 2013-03-24 19:00:58 +01:00
Laurent Destailleur
3ef8bf55fa Fix: Better line position of information 2013-03-24 16:17:36 +01:00
Laurent Destailleur
ff2407a454 Add hidden option to setup font size of information. 2013-03-24 14:01:33 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Laurent Destailleur
a890c7b3ab Fix: Option to hide if no permission instead of grey was broken. 2013-03-24 03:51:49 +01:00
Laurent Destailleur
9391d0d2d6 New: SeparatorThousand and SeparatorDecimal accepts ' chars. 2013-03-24 03:12:40 +01:00
Laurent Destailleur
fe7cad8d6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-24 02:28:29 +01:00
Laurent Destailleur
24427d2c65 Use combo list for revenue stamp 2013-03-24 00:35: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
c3589e9785 Some debug into cron module: 
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
 2013-03-23 19:23:17 +01:00
Laurent Destailleur
9fe0d2cdd2 Fix: Removed a lors 'pre'. Also accurency of data must not be overwrite 
by odt template engine (to be compatible with all countries precision).
 2013-03-23 18:22:25 +01:00
Laurent Destailleur
73de8d169f Fix: Avoid call method on non object error 2013-03-23 18:04:46 +01:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
eldy
90025f9c13 Work on revenue stamp 2013-03-23 13:07:25 +01:00
eldy
c8d6e9e44a Fix: List of customers to build invoice or order 2013-03-23 12:33:25 +01:00
eldy
3af7ca5ac8 Work on revenue stamp feature. 2013-03-23 12:23:09 +01:00
Regis Houssin
34bfdb1846 Fix: broken feature if the table has no field fk_parent_line 2013-03-22 19:21:46 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
708f0472cd Qual: Prepare menu handler to be able to output content into a list. 2013-03-22 16:40:35 +01:00
Laurent Destailleur
bf912e2c78 Fix: Some bug into supplier pdf invoice setup. 2013-03-19 15:19:31 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +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
c6b4259735 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
Grand Philippe
29b8ce1c2d try to fix: supplier invoice numbering 2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9 normalize 2013-03-17 14:40:49 +01:00
Grand Philippe
57d20e28fb normalize and simplify code 2013-03-17 12:56:54 +01:00
Grand Philippe
88256b7531 normalize 2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-17 10:03:29 +01:00
Grand Philippe
d2c10159fe try to fix : cannot display numbering models 2013-03-16 17:10:24 +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
Laurent Destailleur
013b7eca10 Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
 2013-03-16 17:02:13 +01:00
Grand Philippe
86dff79b73 try to fix : cannot display numbering models 2013-03-16 16:58:45 +01:00
Laurent Destailleur
2da3fb68a0 Merge pull request #751 from jfefe/extrasep 
New type of extrafield : separator
 2013-03-16 07:41:34 -07:00
Laurent Destailleur
ca0d3be33b Merge pull request #750 from grandoc/develop 
Develop
 2013-03-16 07:40:05 -07:00
Laurent Destailleur
d590aa56eb Merge pull request #749 from simnandez/3.3 
Fix: Bad orders list viewstatut filter if expeditons module is disabled
 2013-03-16 07:39:31 -07:00
Laurent Destailleur
fcef334122 Merge pull request #748 from GPCsolutions/naturalsearch 
Natural search
 2013-03-16 07:38:55 -07:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00
Grand Philippe
cdb521663e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-16 10:35:12 +01:00
fhenry
cf21b32eb1 task #768 2013-03-16 09:46:34 +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
65a9edd5a7 Fix : lang 2013-03-16 01:52:56 +01:00
jfefe
5f1141675c Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not. 2013-03-16 01:10:21 +01:00
jfefe
ba0963ea7d Fix : implement separator extrafield - missing check on update 2013-03-16 00:00:57 +01:00
jfefe
b36b776f10 IKM : work on new extrafield separator type 2013-03-15 23:39:18 +01:00
Grand Philippe
7dbc782d42 prepair numbering models for supplier invoices 2013-03-15 19:03:07 +01:00
jfefe
b1d50e3f7f Move extrafield type select list on top of form 2013-03-15 18:56:44 +01:00
jfefe
654e99df8c Work on new type of extrafield : separator with no field stored in database 2013-03-15 18:56:10 +01:00
Grand Philippe
e46900ad84 prepair numbering models for supplier invoices 2013-03-15 18:40:31 +01:00
Laurent Destailleur
9bae946178 Fix: Return of function with no return should not be set into a 
variable.
 2013-03-15 18:27:48 +01:00
jfefe
74f480a53b Merge remote-tracking branch 'upstream/develop' into extrafields 2013-03-15 18:21:03 +01:00
Laurent Destailleur
8a487a90af New: Still working on menu manager rewrite. 2013-03-15 18:00:29 +01:00
Grand Philippe
8f7c629d9c prepair numbering models for supplier invoices 2013-03-15 17:45:25 +01:00
Laurent Destailleur
7a152c8e0b Prepare code to be compatible when we will store localtax_type into 
lines.
 2013-03-15 17:29:18 +01:00
Laurent Destailleur
f522b18bdc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-15 17:14:06 +01:00
Laurent Destailleur
2ab28d974f Fix: Use better test to show localtax to avoid problem when switching 
from different country.
Perf: Can return all localtaxes in one call.
 2013-03-15 17:10:18 +01:00
Laurent Destailleur
1a62cdfbe8 Fix: Use better test to show localtax to avoid problem when switching 
from different country.
 2013-03-15 17:06:42 +01:00
Grand Philippe
a9eed57e27 prepair numbering models for supplier invoices 2013-03-15 16:43:28 +01:00
simnandez
c0e5cacafc Fix: Bad orders list viewstatut filter if expeditons module is disabled 2013-03-15 16:18:14 +01:00
Grand Philippe
b0bce23595 prepair numbering models for supplier invoices 2013-03-15 16:16:38 +01:00
Raphaël Doursenaud
16efed11ca Added natural search to product line search 2013-03-15 16:05:49 +01:00
Grand Philippe
3c7c5f262f anglicization of comments 2013-03-15 16:03:03 +01:00
Laurent Destailleur
a86c6ac39d New: price function can show price with currency symbol. 2013-03-15 15:59:51 +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
9f9f6c8311 [ task #767 ] 2013-03-15 11:59:15 +01:00
Laurent Destailleur
fbdf438351 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-03-14 17:01:44 +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
jfefe
76efc04840 Show number with dot to avoid error when update extrafield 2013-03-13 22:01:34 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Laurent Destailleur
80b5bd7215 Comment 2013-03-13 19:14:49 +01:00
Laurent Destailleur
ed5d1196b2 Fix: no link if user unknown 2013-03-13 17:34:54 +01:00
Laurent Destailleur
5149ea9f51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-13 11:10:51 +01:00
Laurent Destailleur
60930d9e74 New: Enhance Dolibarr migration process to include migration script of 
external modules.
 2013-03-13 11:06:28 +01:00
Laurent Destailleur
4db666824f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-12 16:13:56 +01:00
Laurent Destailleur
390921512c Move info message on top right 2013-03-12 15:56:47 +01:00
Laurent Destailleur
854cd5dbe3 Merge pull request #736 from simnandez/develop 
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc. Supplier order
 2013-03-12 07:31:04 -07:00
simnandez
8114249fca [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Supplier order
 2013-03-12 15:06:38 +01:00
frederic34
33e6654454 print ipp 2013-03-12 01:06:49 +01:00
frederic34
9c8a9ff7dc Print IPP 2013-03-11 23:35:31 +01:00
BENKE Charles
425ed19e20 Update sendings.lib.php 
delivery_prepare_head 
complete_head_from_modules object->id 
but the good one is $object->origin_id
so we temporary change it
 2013-03-11 21:01:04 +01:00
Laurent Destailleur
0219f11e64 Fix: Missing default value 2013-03-11 17:01:46 +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
b0d7b33815 Merge pull request #715 from jfefe/extrafields 
[ task #746 ] add extrafields support on propal object
 2013-03-11 08:44:59 -07:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43 Fix: Usage of order into export broken when filters are used 2013-03-11 14:09:54 +01:00
Laurent Destailleur
d8af59756d New: Add function dolGetFirstLastname 2013-03-11 10:11:43 +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
dbba8fd6ba New: Can force picto path so an external module can use it with its own 
picto
 2013-03-10 13:23:55 +01:00
Laurent Destailleur
9b8a8351b4 Fix: Menu hidden 2013-03-10 13:22:51 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
60f16e1a88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865 Merge pull request #724 from KreizIT/develop 
Add trigger BILL_UNVALIDATE when invoice is unvalidate
 2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
00f4e6ad85 Fix: Force format text of excel text fields 2013-03-09 16:58:55 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +01:00
Laurent Destailleur
0f1741a06b New: hooks for pdf_writelinedesc now implement the rule to overwrite or 
not default code (http://wiki.dolibarr.org/index.php/Hooks_system)
 2013-03-09 15:05:09 +01:00
Laurent Destailleur
72749bfc5f Merge pull request #721 from frederic34/develop 
Print IPP
 2013-03-08 08:31:15 -08:00
Laurent Destailleur
0fe91796ef New: [ task #696 ] Remove "new stdClass();" when possible 2013-03-08 15:52:23 +01:00
frederic34
18ff2fd198 Merge remote-tracking branch 'upstream/develop' into develop 2013-03-08 13:30:44 +01:00
Laurent Destailleur
e5f712fe14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-08 12:09:49 +01:00
Laurent Destailleur
2a67af3c94 New: when adding an action, we can define a free code to tag it for 
a specific need.
 2013-03-08 12:04:01 +01:00
frederic34
135de9ecdb Print IPP 2013-03-08 11:54:32 +01:00
frederic34
2e03169acd Print IPP icon display in formfile 2013-03-08 11:47:48 +01:00
frederic34
cdb1242bb5 Print IPP fix and printer icon 2013-03-08 11:38:30 +01:00
frederic34
16c5427366 Print IPP 2013-03-08 11:26:05 +01:00
Laurent Destailleur
1e5c56642c Fix: Some regression after renaming state and lastname. 2013-03-08 02:49:42 +01:00
Laurent Destailleur
c86f3ef4b4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2013-03-08 01:57:32 +01:00
Laurent Destailleur
44698fcde0 Fix: dol_is_dir may not be loaded, so call fails 2013-03-08 01:53:41 +01:00
Laurent Destailleur
b060e5961b Qual: Another step in men manager rewrite. 2013-03-07 19:47:03 +01:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation 
Conflicts:
	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/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2013-03-07 19:13:50 +01:00
Laurent Destailleur
c762c93eb1 Fix: Several problem with localtax into PDF generation 2013-03-07 12:04:12 +01:00
Laurent Destailleur
3defd294cb Merge remote-tracking branch 'origin/3.3' into develop 2013-03-07 11:08:15 +01:00
jfefe
fcd81e47eb Use price2num() function instead of price() to use calcul in ODT. 
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
 2013-03-07 03:43:23 +01:00
jfefe
289e2e7888 New function to fill ODT substitution array with extrafield of object 2013-03-07 03:27:28 +01:00
jfefe
65ed01a251 Extrafields on ODT (propal) : fix value of price with currency & display date with correct format 2013-03-07 03:27:20 +01:00
jfefe
ac3116930c Add value to store price type extrafield without currency in ODT 2013-03-07 03:27:08 +01:00
jfefe
06807ce198 Fix : select correct value of extrafield (select list) 2013-03-07 02:13:21 +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
eldy
6c2841d4d6 New: Type of fields are received by export format handlers 2013-03-06 22:28:15 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-06 21:28:50 +01:00
jfefe
04617d0eb3 Show extrafields for object into invoice ODT document 2013-03-06 05:33: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
jfefe
55bfdd341d Fix : change to variable with unused name 2013-03-05 23:51:42 +01:00
jfefe
bd229a9417 Add param to define key name in return array of substitution function 
for propal
 2013-03-05 22:23:57 +01:00
fhenry
617a71478b fix [ bug #749 ] 2013-03-05 19:05:12 +01:00
Laurent Destailleur
c37e873ab4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
 2013-03-05 18:32:01 +01:00
Laurent Destailleur
c11f7dfc71 Next step for rewriting menu managers. 2013-03-05 15:42:26 +01:00
jfefe
5ce11d00dd Display linked propal information into invoice ODT 2013-03-05 15:11:51 +01:00
Laurent Destailleur
de6d40237d Fix: No syntax error when when want no limit 2013-03-05 13:28:31 +01:00
JF FERRY
ff2a851ae8 Move substitution function for propal to common class & add extrafields display 2013-03-05 08:38:41 +01:00
Laurent Destailleur
215731dc59 Fix bug 2013-03-05 00:14:04 +01:00
Laurent Destailleur
b036120c70 Labels 2013-03-04 23:56:17 +01:00
Laurent Destailleur
555b3a1199 Fix:; Removed warning 2013-03-04 21:00:22 +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
fhenry
b0212fc8e6 Fix [ bug #742 ] 
and translation of constant description
 2013-03-03 21:23:18 +01:00
simnandez
a811121daf [ task #731 ] Uniformize ref generation 2013-03-02 16:50:36 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Laurent Destailleur
f172c900c7 Qual: Uniformize menu code 2013-03-02 14:43:36 +01:00
simnandez
0cb5b3f50c Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:32:49 +01:00
eldy
4e52b2596a Uniformize code 2013-02-28 23:49:38 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9 Fix: try to fix regression, stored the last id created in a session 
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
 2013-02-28 18:47:38 +01:00
Laurent Destailleur
7bbbda2dce New: dol_syslog method accept a suffix to use different log files for 
log.
 2013-02-28 16:19:16 +01:00
Laurent Destailleur
fd6b51413c Civility not required in a short label 2013-02-28 15:37:53 +01:00
Laurent Destailleur
33feddcd32 Qual: Rewrite of menu manager. next step. 2013-02-27 21:40:43 +01:00
Laurent Destailleur
bdcb6bdef5 Try to aplpy enhancements defined into 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
 2013-02-26 20:15:20 +01:00
Laurent Destailleur
402fe2e417 Merge remote-tracking branch 'origin/3.3' into develop 2013-02-26 20:05:23 +01:00
Grand Philippe
d8edb3c074 display enhancement for models 2013-02-26 17:41:08 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Laurent Destailleur
43a248b88b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-02-25 13:01:56 +01:00
Laurent Destailleur
2dc4b91521 New: Function plimit of databases drivers accept -1 as value (it means 
default value set into conf->liste_limit).
 2013-02-25 12:51:38 +01:00
Maxime Kohlhaas
428f844b4d LDAP : add option to get data as an array 2013-02-25 11:57:52 +01:00
Maxime Kohlhaas
cfa1a41a16 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-25 11:54:26 +01:00
Laurent Destailleur
b9ead08968 Merge pull request #691 from grandoc/develop 
english language standardization
 2013-02-25 01:32:26 -08:00
Laurent Destailleur
e748f07806 Qual: Using divs instead of tables 2013-02-25 10:31:47 +01:00
Grand Philippe
ffeb066b1b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 10:30:48 +01:00
Laurent Destailleur
ae322ba17f Qual: Better init of default lang 2013-02-25 10:17:38 +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
b61c576343 Qual: Still work onto menu management rewrite. 2013-02-24 21:16:36 +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
24eab5b8fd New: Add page with seach only boxes. 2013-02-24 18:22:28 +01:00
Laurent Destailleur
234e171e9d New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page. 2013-02-24 18:16:26 +01:00
Laurent Destailleur
a6378ab0bb Cleaner HTML code 2013-02-24 18:08:27 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
8c765ace99 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 15:30:39 +01:00
Laurent Destailleur
3baf8a6c00 New: Use div instead of tables into login page. 2013-02-24 14:57:49 +01:00
Laurent Destailleur
6b20370ffa Fix: Check consitency of option NOREQUIREXXX 2013-02-24 14:54:08 +01:00
Grand Philippe
7596096b89 some fix for english language standardization 2013-02-24 14:46:00 +01:00
Laurent Destailleur
0b61c740a9 Fix: To be sure to start onto an selected top menu 2013-02-24 13:57:17 +01:00
Grand Philippe
9175f241ff Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 10:10:52 +01:00
Laurent Destailleur
08bde6faa5 Fix: Do not load menu when not required. 2013-02-24 03:45:19 +01:00
Laurent Destailleur
50de5a944a Fix: compatibility with new menu manager 2013-02-24 03:29:03 +01:00
Laurent Destailleur
d3c2d088a9 New: Add url to get menu only. Work on progress. 2013-02-24 02:55:25 +01:00
Laurent Destailleur
cd56fa61e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 02:47:47 +01:00
Laurent Destailleur
d786e8ca6e Code comment 2013-02-24 02:42:37 +01:00
Laurent Destailleur
c62f87380c Qual: use div instead of table 2013-02-24 02:41:46 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082 english language standardization 2013-02-23 17:01:10 +01:00
Laurent Destailleur
4dbf5a20ad Merge pull request #687 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 07:38:55 -08:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
f862adc4d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 15:27:06 +01:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
Grand Philippe
37cce5d860 fix: change name with lastname 2013-02-23 14:31:59 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 03:11:52 -08:00
Laurent Destailleur
bbe145cc47 Merge pull request #681 from grandoc/develop 
english standardization
 2013-02-23 03:08:56 -08:00
Laurent Destailleur
845e4ff93d Merge pull request #684 from jfefe/develop 
Fix bug #732 : Missing argument when calling selectcontacts method
 2013-02-23 02:55:46 -08: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
a0df6764d8 english standardization 2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2 english standardization 2013-02-22 17:11:53 +01:00
jfefe
34bfdf92cd Fix bug #732 : Missing argument when calling selectcontacts method 2013-02-22 15:34:20 +01:00
Maxime Kohlhaas
04e1be4afd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-22 15:24:49 +01:00
Maxime Kohlhaas
87dc3a0b22 LDAP sync : trigger was launched even if LDAP_SYNCHRO_ACTIVE is 'ldap2dolibarr' 2013-02-22 15:24:29 +01:00
fhenry
af6bb94ff3 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 15:02:33 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Laurent Destailleur
8c4e13230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 14:20:46 +01:00
philippe
b4e43bbc41 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:58:19 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:02:15 +01:00
Regis Houssin
8a5f68de9c Fix: wrong hidden 2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when 
building pdf and payment mode is withdraw.
 2013-02-22 12:04:38 +01:00
philippe
fae9f73ea4 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87 Fix: hide blocs with multi-page 2013-02-22 11:25:29 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:06:45 +01:00
Regis Houssin
289ff4fe1a Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:03:20 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
6259f4ce59 Fix : some & -> &amp; 2013-02-21 23:08:58 +01:00
Laurent Destailleur
0aa24369fd Merge pull request #676 from frederic34/develop 
New: Add some carrier
 2013-02-21 12:44:30 -08:00
Laurent Destailleur
c24b29343a Merge pull request #674 from simnandez/develop 
Qual: Try to delete no more used addpropal.php
 2013-02-21 12:39:47 -08:00
eldy
3d80a6ebfc Fix: Enhance pgsql driver 2013-02-21 21:04:20 +01:00
simnandez
5d357c7736 Trad: Fix activity box translation 2013-02-21 18:48:56 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +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
2017815e89 Fix: Works for both normalized modules and external modules 2013-02-20 17:34:03 +01:00
Laurent Destailleur
1aee361ffd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-20 14:58:56 +01:00
Laurent Destailleur
f194ee5363 Fix: core dir of external modules must be into dir of module. 2013-02-20 14:58:40 +01:00
Laurent Destailleur
e5e4c113a3 Merge pull request #672 from jfefe/extrafields 
Fix : extrafields value in ODT document
 2013-02-20 03:05:54 -08:00
jfefe
1941efa45a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-02-20 11:15:15 +01:00
Laurent Destailleur
d07c5ae49f Merge pull request #669 from simnandez/develop 
Fix: Translation
 2013-02-19 12:11:06 -08:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
simnandez
94d1f6e0c2 Fix: sourcecompany now works with state instead departement (deprecated) 
into build_address
 2013-02-19 16:05:55 +01:00
simnandez
9e3497cff3 New: Add ES formated address country rule 2013-02-19 16:02:58 +01:00
Laurent Destailleur
3912013a05 Merge pull request #668 from FHenry/develop 
Better to use foreach because when add mail in $cible array we can test
 2013-02-19 01:14:23 -08:00
fhenry
3e42f90b1e Better to use foreach because when add mail in $cible array we can test 
with (!array_key_exists($obj->email, $cibles)) better than old method
 2013-02-19 04:48:39 +01:00
Laurent Destailleur
4119fde0e5 Merge pull request #665 from FHenry/develop 
Fix mass mailing tabs regression
 2013-02-18 07:46:07 -08:00
jfefe
a197e6a026 Merge branch 'extra_odt' into extrafields 2013-02-18 15:50:47 +01:00
jfefe
110713f6ca Fix : display correct value in ODT for extrafields 2013-02-18 15:47:40 +01:00
fhenry
195af1f2bd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-18 15:25:27 +01:00
fhenry
fd4a465c90 Fix mass maling tabs regression 2013-02-18 15:25:13 +01:00
Laurent Destailleur
da7b5e352f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
 2013-02-18 15:01:00 +01:00
jfefe
2f4a80215b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-02-18 13:39:00 +01:00
jfefe
fe57b513f8 Merge branch 'extra_odt' into extrafields 2013-02-18 00:58:54 +01:00
jfefe
71a2b4c8c0 In ODT document add currency symbol with extrafields of type "price" 2013-02-18 00:58:40 +01:00
jfefe
3ef8c6e5dd Missing variable declaration 2013-02-18 00:40:49 +01:00
fhenry
3694031053 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-17 21:41:27 +01:00
jfefe
8ebb48cb5c Fix : in ODT show value and not label of company extrafield 2013-02-17 21:28:00 +01:00
jfefe
060060f08b Missing object $langs when showing extrafield of type 'price' 2013-02-17 21:27:48 +01:00
jfefe
16e9f6db48 Fix : bad name of property when retrieve extrafields for thirdparty 2013-02-17 21:27:33 +01:00
jfefe
527beab671 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extra_odt 2013-02-17 21:26:56 +01:00
Laurent Destailleur
249a03dd57 Merge pull request #659 from jfefe/extrafields 
Work on extrafields
 2013-02-16 14:19:24 -08:00
Laurent Destailleur
2ea62073b6 Merge pull request #660 from grandoc/develop 
fix : doesn't work with a /
 2013-02-16 14:14:30 -08:00
Laurent Destailleur
50decdd941 Fix: When creating user on other entity, no way to read user 
after creation.
 2013-02-16 21:06:15 +01:00
jfefe
fa53147d0a Retrieve extrafields when fetch thirparty 
Work on extrafields support in thirpdparty ODT document
 2013-02-16 03:41:11 +01:00
Grand Philippe
ab2b06117b fix trad : change adresse versus address 2013-02-15 19:56:51 +01:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Laurent Destailleur
b1ee14ce60 New: Can define a hierarchical responsible on users. 2013-02-15 18:39:27 +01:00
Grand Philippe
7c47dedbce fix trad: begin change address instead of adresse 2013-02-15 17:33:07 +01:00
Laurent Destailleur
e0bbb78f56 Fix: Merge customer and prospect tab 2013-02-15 17:28:07 +01:00
Laurent Destailleur
7260f39d21 New: Support tag total_vat_x.y for vat rate x.y into ODT templates 2013-02-15 17:06:32 +01:00
Grand Philippe
7c1a4e6fdf fix trad to get better understanding 2013-02-15 15:48:53 +01:00
jfefe
3d8197ce4b Work on extrafields : position management & new type : select list 2013-02-15 11:19:49 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +01:00
fhenry
c02bd08711 Checkstyle 2013-02-14 16:35:54 +01:00
fhenry
ff214dd295 Manage tabs (add/remove by external module) for mass emalings screen 2013-02-14 16:25:43 +01:00
jfefe
e2d03a9dba Add possibility to disable hook on list of recent file 2013-02-14 13:15:23 +01:00
Laurent Destailleur
91215a075a Merge pull request #653 from atm-maxime/develop 
Set draft function
 2013-02-13 08:54:57 -08:00
Laurent Destailleur
7d1c51ab77 Add option MAIN_PDF_TITLE_BACKGROUND_COLOR 2013-02-13 16:45:53 +01:00
Maxime Kohlhaas
bfc5cfebce Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-13 15:42:41 +01:00
fhenry
136dc651f3 Merge branch 'develop' into develop_merger_cust_prospect_tab 2013-02-12 19:18:15 +01:00
fhenry
82fc8e1536 Task 350 in Doliforge 2013-02-12 19:16:48 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Laurent Destailleur
4c936ffffd Merge pull request #645 from FHenry/dev_contactcombox 
Task [ task #711 ]
 2013-02-12 06:08:04 -08:00
fhenry
d8d4b669ab Task [ task #711 ] 2013-02-12 09:49:27 +01:00
Laurent Destailleur
82dda5723b Fix: Disable autocomplete 2013-02-12 01:29:26 +01:00
Laurent Destailleur
d2275a0bbd New: Add param to show title 2013-02-11 20:26:01 +01:00
Maxime Kohlhaas
717a834e8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-08 13:51:05 +01:00
Maxime Kohlhaas
7c458777cf Task # 559 : product customer prices by quantity, correction 2013-02-04 10:21:59 +01:00
simnandez
ad91eab0ac [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Uniformize propal code (not use addpropal.php)
 2013-02-02 18:31:45 +01:00
Maxime Kohlhaas
da066badc8 LDAP : no user update for the moment, dev for updating user from ldap is not working yet 2013-01-30 16:53:59 +01:00
Maxime Kohlhaas
51800a0dd5 Security : add phtml extension to be dealed as php extension 2013-01-30 16:52:33 +01:00
Maxime Kohlhaas
a3027d4590 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-01-30 16:50:32 +01:00
Maxime Kohlhaas
faccc978b4 LDAP : start implementing user update function after LDAP connexion 2013-01-30 16:50:28 +01:00
Laurent Destailleur
30764a6c00 Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party 
selection when autocomplete is on.
 2013-01-29 16:14:53 +01:00
Laurent Destailleur
180fb2c91a Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party 
selection when autocomplete is on.
 2013-01-29 15:22:07 +01:00
Laurent Destailleur
755325dcf0 Qual: Removed deprecated file 2013-01-28 17:59:35 +01:00
Laurent Destailleur
f4c4a43f57 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-28 17:31:17 +01:00
Laurent Destailleur
0743049dc4 Fix: get list of currencies 2013-01-28 14:57:37 +01:00
Laurent Destailleur
c42a0c5b03 Fix: removed warning 2013-01-28 14:40:15 +01:00
Laurent Destailleur
ac3ccade98 Fix: number of chars to low to show value. 2013-01-28 13:11:12 +01:00
Laurent Destailleur
a8ccc0ab0b Fix: loghandler loaded twice. 2013-01-28 12:36:15 +01:00
Laurent Destailleur
db38c9baac Fix: loghandler loaded twice 2013-01-28 12:35:29 +01:00
Laurent Destailleur
b98151db94 Fix: A log handler can be loaded twice. 2013-01-28 12:22:12 +01:00
Laurent Destailleur
1b8634588f Fix: Missing property 2013-01-28 11:31:44 +01:00
Laurent Destailleur
dde8738999 Qual: Add a protection to detect bad usage of getStaticMember 2013-01-28 11:30:28 +01:00
Laurent Destailleur
2002388098 Revert "New: add hook getFormMail" 
This reverts commit c732532483.
 2013-01-26 13:40:31 +01:00
Regis Houssin
647cbb08fb Fix: wrong EOL 2013-01-26 10:38:11 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +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
Laurent Destailleur
70b21172f9 Qual: Removed not used and deprecated property 2013-01-25 11:05:44 +01:00
Regis Houssin
6089ba614e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2013-01-24 17:32:52 +01:00
Regis Houssin
c688e2afab New: add hook getFormMail 2013-01-24 17:31:22 +01:00
Regis Houssin
c732532483 New: add hook getFormMail 2013-01-24 17:29:11 +01:00
Laurent Destailleur
9f44161e55 New: Can attach file for trip and expenses module 2013-01-24 12:47:06 +01:00
Laurent Destailleur
8682d3c928 Fix: Note not visible 2013-01-24 12:16:00 +01:00
Laurent Destailleur
a7d41d74e8 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 18:09:05 +01:00
Laurent Destailleur
5f2af00397 Add logs to debug 2013-01-23 00:24:20 +01:00
Laurent Destailleur
d2152a8342 Restore correct code: A module decide if standard code is used or not 
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
 2013-01-22 18:15:51 +01:00
Regis Houssin
7b04da43c1 Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-01-22 18:07:22 +01:00
Regis Houssin
bfe57b21b0 Fix: disable "datetimepicker" from edit in place for the moment 2013-01-22 18:05:41 +01:00
Regis Houssin
a019b1c854 Fix: disable "datetimepicker" from edit in place for the moment 2013-01-22 18:04:04 +01:00
Laurent Destailleur
b0c1137397 Restore correct code: A module decide if standard code is used or not 
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
 2013-01-22 17:43:41 +01:00
Regis Houssin
910543c5b9 Fix: broken feature 2013-01-22 16:53:39 +01:00
Regis Houssin
f0361b9c4c Fix: broken feature 2013-01-22 16:51:10 +01:00
Laurent Destailleur
3faa2b558f Renamed param. 2013-01-21 15:04:34 +01:00
Laurent Destailleur
47c42943e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-19 16:29:35 +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
simnandez
f7e5edb0f8 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-19 10:45:57 +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
591eab4826 Detect another problem into box. Just add a comment. 2013-01-18 14:22:18 +01:00
Laurent Destailleur
a12972034f Fix: Start to fix some bugs 2013-01-18 13:56:36 +01:00
Laurent Destailleur
f650888ea6 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d Fix: Bad error management 2013-01-18 12:09:39 +01:00
Laurent Destailleur
57a869683d Fix date function 2013-01-18 11:28:06 +01:00
Laurent Destailleur
6091f74b13 New: First changes to simplify/optimize menu management. 2013-01-17 18:39:15 +01:00
Laurent Destailleur
c16269d04e Fix: load at wrong place 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2013-01-17 17:59:47 +01:00
Laurent Destailleur
b89b74e933 Fix: load at wrong place 2013-01-17 17:40:27 +01:00
Laurent Destailleur
f0f347394a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-17 13:15:30 +01:00
Laurent Destailleur
cccc7d1af3 Fix: comments 2013-01-17 13:02:34 +01:00
Laurent Destailleur
0923102c4a Fix: Duplicate declaration 2013-01-16 16:53:47 +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
0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php
 2013-01-16 14:11:19 +01:00
Laurent Destailleur
3b8e99dd4e Fix: Bad menu def 2013-01-15 18:49:53 +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
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
db1cd6b27f Qual: Merge the 2 class MenuTop and MenuLeft into menu handler file 
into 1 class MenuManager. This make code simpler and is also a first
step to optimize performance of menu loading.
 2013-01-15 15:42:39 +01:00
Laurent Destailleur
ec5b4f5fa7 Fix: Start to fix some bug (pgsql compatibility), try to optimize 
request. Added FIXME tags.
 2013-01-15 15:36:04 +01:00
Laurent Destailleur
1851aa4646 Fix: Move not stable feature as experimental. Disabled box by default 
because there is still some bug (pgsl support, filters) and major
problem to solve (it slow down seriously Dolibarr, result not accurate
for some status).
 2013-01-15 15:26:46 +01:00
Laurent Destailleur
4cf56eafa5 Qual: Removed useless param 2013-01-15 12:48:46 +01:00
Laurent Destailleur
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
086b223c81 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-15 11:50:15 +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
fhenry
52b4d98849 remove parenthesis not usefull 2013-01-15 11:11:24 +01:00
fhenry
f214c06b1e Add option to fecth extrafield even if extranal extrafield module is 
enabled. Usefull for web service to fetch optionnal from llx_extrafields
even if record or update is manage by hook with external module
 2013-01-15 10:20:19 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
fhenry
51098c1227 Add standard extrafield type : 
- mail
	- phone
	- price
 2013-01-14 16:13:09 +01:00
Laurent Destailleur
49313fff3b Fix: External user should not see boxes of modules not allowed to 
external users.
 2013-01-14 13:06:08 +01:00
Laurent Destailleur
b9dc76ebaf Fix: List of contacts when connected as external user. 2013-01-14 12:27:19 +01:00
Laurent Destailleur
6746e76564 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 12:24:06 +01:00
Maxime Kohlhaas
6abf682faa Multi-company compatibility with transverse mode for pdf models 2013-01-14 12:01:44 +01:00
Laurent Destailleur
07ba988cf8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 11:45:16 +01:00
Laurent Destailleur
297c10d16b Qual: externalise code of merging PDFs into a library. 2013-01-14 11:39:30 +01:00
Maxime Kohlhaas
fb1d99d0dd Multi-company compatibility with transverse mode for home boxes 2013-01-14 11:09:10 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
0f6506d457 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:57:55 +01:00
Laurent Destailleur
1bed4aa193 Merge pull request #602 from FHenry/develop 
Add boolean (checkbox) standard extrafield feature
 2013-01-12 06:53:48 -08:00
Laurent Destailleur
8152dda733 Merge pull request #601 from simnandez/develop 
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
 2013-01-12 06:45:34 -08:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch 
New: Add hook for agenda, info and category tabs
 2013-01-12 14:34:16 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00
simnandez
96c5eacf4a [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 09:58:21 +01:00
Christophe Battarel
62ccb57857 fix missing td 2013-01-11 15:41:47 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Laurent Destailleur
37b6bab893 Fix: Missing lang loading 2013-01-10 22:45:55 +01:00
Laurent Destailleur
03b906808e Merge pull request #593 from marcosgdf/eu-vat 
Updated EU VAT area links and added Isle of Man
 2013-01-10 12:12:25 -08:00
Marcos García
8e7a66a544 Fixed indentation problem 2013-01-10 14:20:03 +01:00
Marcos García
809367d23b Updated EU VAT area links and added Isle of Man 
Isle of Man is in included in UK state as shown in http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
 2013-01-10 14:17:43 +01:00
Marcos García
593db37423 Function getTotalDiscount of commonobject.class.php should always return a float for precission 2013-01-10 13:53:46 +01:00
Laurent Destailleur
8ac33e98e7 Fix: property object_total_discount was not working when quantity was 
not 1.
 2013-01-10 12:58:46 +01:00
Laurent Destailleur
9d886eca53 Fix: Scan of correct dir when them dir is forced 2013-01-10 11:19:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Laurent Destailleur
abccfdd168 Fix: Option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-09 19:56:43 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
f3df7a2fec Fix: An easier to understand fix. Remove also not recommanded "continue 
2" instructions.
 2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c Merge pull request #581 from simnandez/3.3 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
 2013-01-08 13:38:38 -08:00
Regis Houssin
dd08da6ea8 Merge pull request #583 from FHenry/develop 
[ task #664 ] Add extrafields behaviours to Member Type
 2013-01-08 10:58:46 -08:00
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
Laurent Destailleur
b7a5e226c9 Fix: Disable menu entry of a not avilable feature 2013-01-08 18:53:45 +01:00
Laurent Destailleur
9b6289503c Fix: Overwriting of login template works with module_parts. 2013-01-08 18:30:49 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
Laurent Destailleur
9b3874f6f9 Fix: PHPUnit found regression 2013-01-08 12:26:02 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
77f177d846 Fix: Bad selection of option 2013-01-08 11:04:29 +01:00
simnandez
596df78d39 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-08 08:46:48 +01:00
Laurent Destailleur
f96c1d83cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 23:22:20 +01:00
Laurent Destailleur
0889bdc3eb Fix: Error using static method 2013-01-07 23:20:00 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
de83dc68e1 New: Uniformize odt generation to use hooks like pdf generation 2013-01-07 02:24:20 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
Laurent Destailleur
4e27969317 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-02 22:15:58 +01:00
Laurent Destailleur
b667400cc1 Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 21:35:28 +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
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
BENKE Charles
4eab7b004e Update htdocs/core/boxes/box_activity.php 
new release with "last 2 year bills"
 2013-01-02 11:08:05 +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
d7121f6351 Updated demo trigger class with last changes in triggers 2012-12-31 05:30:09 +01:00
Marcos García
93c5acbf39 There's actually no CONTRACT_MODIFY trigger 2012-12-31 05:26:56 +01:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
717657dd05 Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO 2012-12-30 12:40:32 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3 
Improved translations
 2012-12-29 07:29:29 -08:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a Fix: typo 2012-12-29 12:16:45 +01:00
Laurent Destailleur
17a3204578 Fix: dol_json_encode was wrong with objects 2012-12-29 06:51:12 +01:00
Marcos García
bae8a749b8 Replaced 'Tel' string with 'Phone' to allow translation 2012-12-29 02:51:35 +01:00
Marcos García
354c00b9ca CerfaFR donation template wasn't translating payment mode 2012-12-29 01:13:31 +01:00
Laurent Destailleur
2bec26c32a Fix: Some fix into menu translation 2012-12-28 19:18:04 +01:00
Laurent Destailleur
012ee020a4 Fix: Bad label 2012-12-28 15:48:20 +01:00
Laurent Destailleur
8436f0666d Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG 
Fix: Margins information must be visible for orders, proposals and
invoices only.
Fix: Delete button for contracts not visible
 2012-12-28 11:36:31 +01:00
Laurent Destailleur
a8012d0f18 Fix: [ bug #617 ] champs non repris lors d'une création de commande à 
partir d'une propale
 2012-12-27 18:02:36 +01:00
Laurent Destailleur
1a530d0ca9 Fix: Broken translation 2012-12-27 17:12:35 +01:00
Laurent Destailleur
ba4be70a5e Fix: External user was not using correct menu handler. 2012-12-27 17:06:55 +01:00
Laurent Destailleur
f566cd4d99 Fix: Use date of user to define if an action is in past or future. 2012-12-27 15:43:52 +01:00
Laurent Destailleur
251f4f3742 Fix: Avoid duplicate link 2012-12-27 15:33:18 +01:00
Laurent Destailleur
f1671e5acf Fix: Remove last chackstyle errors 2012-12-21 11:59:55 +01:00
Laurent Destailleur
8f2baf08ac Fix: Checkstyle 2012-12-21 04:14:02 +01:00
Laurent Destailleur
bcd2fead3d Fix: patch from forum "User permissions on modAgenda" 2012-12-20 17:07:15 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression. 
Include an option to support local tax of type 7 (need more time to
validate this type).
 2012-12-19 18:51:49 +01:00
Laurent Destailleur
e9d7a4adc6 Fix: Removed warnings 2012-12-19 15:29:27 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
6b01c45210 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-18 13:14:29 +01:00
Laurent Destailleur
4cc44292e7 Fix: Maxi debug of holiday module 2012-12-18 13:12:11 +01:00
Laurent Destailleur
752aabfc86 Fix: dynamic menu does not works with auguria. Add a temporary fix. 2012-12-17 23:19:48 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Laurent Destailleur
5a99076cf5 Fix: Clean amarok style. Removed hard coded length of close cells. 2012-12-14 18:35:50 +01:00
Laurent Destailleur
c36d013971 Fix: Link missing 2012-12-14 17:55:42 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Regis Houssin
5f41174cfa Fix: bad path for photo and uniformize code 2012-12-13 11:42:59 +01:00
Laurent Destailleur
57742b347a Fix: Bad position of field with non A4 pages 2012-12-12 20:58:49 +01:00
Laurent Destailleur
a11e4b5124 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 19:02:38 +01:00
Laurent Destailleur
c107697dc1 Fix: Var not always initialized 2012-12-12 18:14:21 +01:00
Laurent Destailleur
e2e86e16d0 Merge pull request #537 from grandoc/develop 
Develop
 2012-12-12 07:01:54 -08:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Grand Philippe
dc0558989b Merge remote-tracking branch 'origin/develop' into develop 2012-12-11 19:04:54 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Laurent Destailleur
77ca4241a5 New: Can input a payment back onto an credit note. 2012-12-09 18:39:42 +01:00
fhenry
b3d21a4320 Fix [ bug #634 ] Install faild on PostGreSQL 
Fix  [ bug #631 ] Index Creation failed on fresh install with PostgreSQL
 2012-12-08 17:01:07 +01:00
Regis Houssin
bfd44da265 Merge pull request #529 from FHenry/develop_extrafielddeletion 
Extrafield remove and PgSQL field tms convertion
 2012-12-08 05:41:41 -08:00
Laurent Destailleur
6a60b78b28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 14:25:36 +01:00
Laurent Destailleur
b119ab5539 Prepare 3.3 freeze. 2012-12-08 14:24:57 +01:00
fhenry
1d6bc23f4d - Uniformize Extrafield deletion for adherent,user,product,societe by 
using commonobject method
 - Add convertion of tms timestamp special case in mysql for pgsql
 2012-12-08 14:23:52 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables 
must be after parent tables).
Fix: Migration of old version
 2012-12-08 14:16:39 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Regis Houssin
f984b669b2 Fix: Fix: Use another method to help avoid having a space in value in 
order to use this value with jquery
 2012-12-07 13:48:11 +01:00
Regis Houssin
be7d545297 Fix: wrong variable name 2012-12-07 10:50:16 +01:00
Regis Houssin
8ea3614a3c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-12-07 10:48:10 +01:00
Regis Houssin
7ff3002993 Fix: Check if amount is numeric, for example, an error occured when 
amount value = o (letter) instead 0 (number)
 2012-12-07 10:47:36 +01:00
Laurent Destailleur
3858085a7f Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" 
onto logon page.
 2012-12-06 17:59:37 +01:00
Laurent Destailleur
4a5062283d Merge pull request #515 from atm-maxime/develop 
New : option to reset numbering to 0 every month using @99 in the mask
 2012-12-05 04:19:16 -08:00
Maxime Kohlhaas
5992ebcdbc New : option to reset numbering to 0 every month using @99 in the mask 2013-02-06 11:52:49 +01:00
Regis Houssin
a4f0b7f0df Fix: avoid error with external modules 2012-12-05 11:36:10 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Maxime Kohlhaas
954a578ebd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-05 09:10:55 +01:00
Laurent Destailleur
e3d07621eb Fuck git. Restore another lost commit. 2012-12-04 20:51:45 +01:00
Laurent Destailleur
b0b0f06655 Fix: Removed useless code 2012-12-03 20:23:16 +01:00
Laurent Destailleur
9b9b8b4156 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-03 20:19:53 +01:00
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an 
event
 2012-12-03 20:19:35 +01:00
Regis Houssin
a0bed6c47f Fix: For avoid conflicts with external modules 2012-12-03 17:29:08 +01:00
Regis Houssin
4388be7295 FIXME $ident is not defined 2012-12-03 17:16:04 +01:00
Laurent Destailleur
7d8c0837b6 Restore another lost commit. 2012-12-02 19:45:35 +01:00
Laurent Destailleur
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
d428549e15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-02 13:51:52 +01:00
Laurent Destailleur
6fcc32b326 Comments 2012-12-02 12:59:06 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b remove unused arrays into pdf models (localtaxes) 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
 2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a show local taxes on crabe pdf model 2012-12-02 10:42:24 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-01 14:36:51 +01:00
Laurent Destailleur
bba1492621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-01 12:23:12 +01:00
Laurent Destailleur
daacf797c4 Merge pull request #500 from cbattarel/develop 
[Task #204] more local taxes manangement
 2012-12-01 02:49:45 -08:00
Laurent Destailleur
31b37c5aff Fix: Length not hard coded 2012-12-01 11:31:02 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
9d17b8f96c Fix: Label not complete 2012-11-30 19:39:22 +01:00
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Christophe Battarel
b70df3762c Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop 2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832 resolve conflict 2012-11-30 10:57:42 +01:00
Laurent Destailleur
b12469c562 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/holiday/fiche.php
 2012-11-29 23:12:16 +01:00
Laurent Destailleur
184cced303 New: Implement all call to allow to remove a tab by an external module 2012-11-29 23:02:02 +01:00
Regis Houssin
3005a4f7cf Fix: use specific code for avoid conflict 2012-11-29 18:37:37 +01:00
Regis Houssin
583dfb225c New: add possibility to force label of buttons and hide the second 
button for dialog info only
 2012-11-29 18:30:16 +01:00
Christophe Battarel
51d87f8f4a function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-11-29 11:36:59 +01:00
Regis Houssin
d97f1937f8 Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!! 2012-11-29 10:25:33 +01:00
Laurent Destailleur
91e6087d1b Perf: Try to reduce amount of memory used to show events 2012-11-29 00:07:05 +01:00
Laurent Destailleur
8212700c41 Fix: EOL 2012-11-28 19:25:12 +01:00
Laurent Destailleur
b45ef4b578 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-28 19:19:56 +01:00
Laurent Destailleur
effe169850 Fix: pdf_getPDFFontSize must be after pdf_getInstance 2012-11-28 19:19:39 +01:00
Christophe Battarel
e459736977 add function gettypeoflocaltax and modify pdf models 2012-11-28 17:47:15 +01:00
Maxime Kohlhaas
5e5cb1da92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 14:53:48 +01:00
Laurent Destailleur
caab5ac4e0 New: Add option to be able to select onto automatic event and manual 
event (or both) into calendar view. Note: For backward compatibility
reason, this will works only for new events.
Qual: Disable old deprecated event code.
 2012-11-28 14:47:30 +01:00
Christophe Battarel
f0918a2536 remove unused arrays into pdf models (localtaxes) 2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4 show local taxes on crabe pdf model 2012-11-28 12:11:42 +01:00
Laurent Destailleur
b34ce6e2f0 Merge pull request #495 from cbattarel/develop 
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. various updates for local taxes
 2012-11-28 02:08:07 -08:00
Maxime Kohlhaas
32f5b4efa6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 10:57:51 +01:00
Christophe Battarel
b9cdde88c7 show localtaxes on einstein pdf model 2012-11-28 10:43:21 +01:00
Christophe Battarel
f00b4b5527 correction to allow global local tax (type 7) on localtax1 2012-11-28 10:24:40 +01:00
Laurent Destailleur
65110ead88 Merge pull request #496 from FHenry/develop 
Update Common Object update_contact method to allow to change the
 2012-11-27 11:32:53 -08:00
fhenry
5c94912e66 Add datehourpicker in editfieldval method to allow display of hour 2012-11-27 18:35:51 +01:00
simnandez
8dc0aec754 [ task #204 ] Manage canadian, spain and other country double VAT with a 
generic system. Add spanish tests
 2012-11-27 16:52:52 +01:00
Christophe Battarel
203a03c4d1 show local taxes on pdf propale azur model 2012-11-27 15:56:45 +01:00
Christophe Battarel
46089bb03c also update ttc with global local taxes 2012-11-27 15:43:52 +01:00
Christophe Battarel
e87bb02323 retrieve global local taxes in update_price function 2012-11-27 15:34:46 +01:00
Christophe Battarel
9f03b56348 dont put global local tax on lines 2012-11-27 15:33:11 +01:00
fhenry
f456a4d0fe Update Common Object update_contact method to allow to change the 
fk_socppoeple linked
 2012-11-27 15:26:14 +01:00
Laurent Destailleur
49730ac24f Code comments only 2012-11-27 13:58:06 +01:00
Laurent Destailleur
c9edac9cd6 Try to fix differently pb of change/keyup because current change has a 
regression (no way to use ajax select onto supplier orders when using
keybord or mouse selection).
 2012-11-26 13:33:18 +01:00
Laurent Destailleur
d9fb0c941b Qual: remove select to have id same with combo and ajax 2012-11-26 13:28:02 +01:00
Laurent Destailleur
641f4b1ecc Qual: Change to unformize returns of hooks. 2012-11-26 13:26:50 +01:00
Laurent Destailleur
4480af348c Fix: Cols at wrong place 2012-11-26 11:57:20 +01:00
Laurent Destailleur
b4ebd7e852 Qual: Uniformize code and fix a regression 2012-11-26 11:36:45 +01:00
Maxime Kohlhaas
437d082308 Fix : multicompany comptability 2012-11-24 00:06:54 +01:00
Maxime Kohlhaas
9e4cba13c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-22 15:24:10 +01:00
Laurent Destailleur
e76ef823b8 New: Add a tab into members statistics to count members by nature. 2012-11-21 23:01:36 +01:00
Laurent Destailleur
59a305f6f1 New: no dash line if last item. 2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5 New: Add option to add slashes lines between lines into PDF. 2012-11-21 19:07:03 +01:00
Laurent Destailleur
c0c13b862a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-21 14:45:33 +01:00
Laurent Destailleur
af637c8afb Qual: Removed "dolibarr" into default email sender. 2012-11-21 14:45:02 +01:00
Laurent Destailleur
d9cdb542d5 Debug filter during export 2012-11-20 14:07:52 +01:00
Laurent Destailleur
ddb3cf6f42 Fix: Debug holiday module 2012-11-20 13:14:16 +01:00
Laurent Destailleur
a62583e987 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 12:33:24 +01:00
Laurent Destailleur
2d000b5df8 Fix: The default select choice was not selected when using jquery dialog 
confirm boxes.
 2012-11-20 12:23:32 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Regis Houssin
a3d9b5788c Fix: use keyup instead change to avoid loosing the product id 
Fix: strict mode
 2012-11-20 12:09:52 +01:00
Laurent Destailleur
e53f6a383d Fix: Removed a hard coded error code. 2012-11-20 11:23:34 +01:00
Laurent Destailleur
0fb126a7e3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-19 17:30:57 +01:00
Laurent Destailleur
3b861598a7 Doc 2012-11-19 17:29:57 +01:00
simnandez
3fe79b379d Fix: Bad calculation of localtax amount calculation if type of 
localtaxes are 1 3 or 5. Researched by Eldy
 2012-11-19 17:10:28 +01:00
Maxime Kohlhaas
ec37a5e005 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-19 13:31:23 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
e0de91144a Merge pull request #484 from simnandez/develop 
Fix: Local taxes. If buyer not subject to localtax no need make database
 2012-11-18 03:11:37 -08:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Laurent Destailleur
61ed6e10e1 Uniformize code 2012-11-16 18:59:03 +01:00
simnandez
5515f15187 Fix: Localtaxes rules for spain 2012-11-16 16:23:51 +01:00
Laurent Destailleur
2e8e1f759f New: Add warning when we try to load sql from an not existing dir 2012-11-16 13:25:49 +01:00
simnandez
b7f38def61 Fix: Local taxes. If buyer not subject to localtax no need make database 
access
 2012-11-16 12:13:29 +01:00
Laurent Destailleur
511a75b5de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 18:59:07 +01:00
Laurent Destailleur
4c4eeaac2a Fix: Test fails if value is 0 2012-11-14 18:56:47 +01:00
Laurent Destailleur
768e719961 Fix: firstname was missing 2012-11-14 18:32:52 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Maxime Kohlhaas
667c8cffae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-14 11:02:35 +01:00
Laurent Destailleur
5e583b65f2 Doxygen 2012-11-14 01:35:39 +01:00
Laurent Destailleur
3dd9d20d53 Add alternative picto for rendez-vous. 2012-11-14 00:59:52 +01:00
Laurent Destailleur
06c77576b7 New: Maxi debug on feature to filter lines on export. Removed a lot of 
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
 2012-11-14 00:27:25 +01:00
Laurent Destailleur
22d1847250 Fix: Option MAIN_MAIL_SENDMAIL_FORCE_BA and MAIN_FIX_BUGGED_MTA was not 
complete.
 2012-11-13 17:25:47 +01:00
Regis Houssin
4ec1d376bf Fix: strict mode journey 2012-11-13 09:02:21 +01:00
Regis Houssin
5faa7fb075 Fix: for module name with number 2012-11-12 19:09:53 +01:00
Laurent Destailleur
124366f41a Fix: To be compatible with LDAP synchro, property oldcopy must be set. 
We add a warning if not.
 2012-11-11 23:31:45 +01:00
Laurent Destailleur
66755fb166 Fix: Avoid confusion between method getXXX into parent class with 
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
 2012-11-11 18:11:10 +01:00
Laurent Destailleur
842982f134 Doxygen 2012-11-11 17:50:24 +01:00
Regis Houssin
2240dd4ac6 Fix: missing tinyint 2012-11-11 15:12:42 +01:00
Maxime Kohlhaas
332c077d77 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-09 13:46:50 +01:00
Maxime Kohlhaas
7035ec42f1 Task # 559 : Modifications to store unitprice as in supplier prices 2012-11-07 00:38:53 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +01:00
Maxime Kohlhaas
5586897f70 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-06 23:07:40 +01:00
Laurent Destailleur
7d01ea7fc3 Fix: Do not break dolibarr usage if log fails 2012-11-06 19:42:03 +01:00
Laurent Destailleur
f37c559235 Fix: regression 2012-11-06 19:23:23 +01:00
Laurent Destailleur
8896803921 New: We can use a dynamic value ($conf->global->XXX for example) into 
titles of menus.
New: Can choose menu entry to show with external site module.
 2012-11-04 21:19:12 +01:00
Regis Houssin
1722db223a Fix: add timepicker default options 2012-11-03 20:41:59 +01:00
Laurent Destailleur
0f2dac163f Fix: Bad label when validating/paying an invoice from POS module 2012-11-03 16:58:07 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test. 
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
 2012-11-03 16:32:49 +01:00
Laurent Destailleur
19c617e4a0 Fix: Solve double ";;" 2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0 Fix: Not enought space for free text. To avoid to edit again and again 
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
 2012-11-03 13:32:37 +01:00
Laurent Destailleur
d3491e9ac0 Fix: Colors must be set into CSS. 2012-11-03 11:55:39 +01:00
Laurent Destailleur
dac97e2115 Fix: Do not try to show supplie ref if not defined. 2012-11-03 11:39:48 +01:00
Laurent Destailleur
f8a9733b73 Again 2 pixels missings 2012-11-03 00:37:10 +01:00
Laurent Destailleur
5f3ceb0081 Fix: Label for payment by cheque using the wrong translation key 
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
 2012-11-02 15:41:09 +01:00
Laurent Destailleur
f87865f039 Fix: crazy pagebreak when warterwark is higher than free space. 2012-11-02 14:21:32 +01:00
Laurent Destailleur
0328f0de11 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-31 19:38:28 +01:00
Laurent Destailleur
9b1f70e58e Fix: Trick to solve easily problem of font for some foreign users. 2012-10-31 19:38:16 +01:00
Regis Houssin
bacc8991b3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-31 15:51:22 +01:00
Regis Houssin
634b5f7d1b Fix: image is hard defined 2012-10-31 15:50:14 +01:00
Laurent Destailleur
fd7aea9779 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-31 15:21:38 +01:00
Laurent Destailleur
18e5f8dea6 Fix: Bad detection of space left 2012-10-31 15:21:21 +01:00
Laurent Destailleur
b619437377 Merge pull request #469 from camlafit/develop 
Return Human readable date product
 2012-10-31 07:13:46 -07:00
Laurent Destailleur
13ef8491b7 Fix: Error management 2012-10-31 15:09:42 +01:00
Laurent Destailleur
68bf51c8dd Qual: Uniformize PDF code 2012-10-31 14:55:35 +01:00
cam.lafit
a3f0ce9063 Merge all substitutions on same loop (Invoicing with odt) 
* It's not necessary to have a redondant loop to substitute all variables
 2012-10-31 14:49:27 +01:00
cam.lafit
7b8b015569 Return Human readable date product 
* By default date with mktime format, not great on Invoice
 2012-10-31 14:49:27 +01:00
Laurent Destailleur
f6d9b2abe3 New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, 
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
 2012-10-31 13:48:59 +01:00
Laurent Destailleur
dbfe71922e Fix: Avoid warnings 2012-10-31 12:35:52 +01:00
Regis Houssin
b70af837df Fix: avoid warning 2012-10-31 09:59:24 +01:00
Regis Houssin
2607a8a3dd Merge pull request #470 from atm-maxime/develop 
Fix : internal contact not displayed in rouget PDF
 2012-10-31 01:51:36 -07:00
Regis Houssin
0e0bbbeddc Fix: morning strict mode 2012-10-31 09:50:20 +01:00
Maxime Kohlhaas
240d310a7f Fix : shipment PDF rouget wasn't using the right var to access related internal contact 2012-10-31 08:57:56 +01:00
Maxime Kohlhaas
69111e423f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-31 08:40:13 +01:00
Laurent Destailleur
64d8d558a5 Qual: Uniformize pdf code 2012-10-31 02:29:45 +01:00
Laurent Destailleur
066bcbb469 Qual: Add dol_format_address PHPUnit tests 2012-10-31 01:45:48 +01:00
Laurent Destailleur
42d2a0a2d1 Fix: Bad position of columns. Works with all paper format now. 2012-10-30 19:24:31 +01:00
Laurent Destailleur
08724f5ec0 Qual: Some changes to use more efficiently bottom of page when there is 
several pages (we don't keep space for total on all pages, but only last
one)
 2012-10-30 18:26:04 +01:00
Laurent Destailleur
54852e29e7 Qual: Removed duplicate template (nearly no difference between sirroco 
and typhon, so no need to keep them both).
 2012-10-30 17:59:16 +01:00
Laurent Destailleur
ea90571925 Fix: The bottom margin is already included into heightforfooter 
This provide 1cm more for product description.
 2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55 Fix: Free text overlap data when not on last page. 2012-10-30 13:11:17 +01:00
Laurent Destailleur
9d44590980 Fix: Using a more precise function to calculate free texts height avoid 
having few pixels offset on free texts.
 2012-10-30 11:17:49 +01:00
Maxime Kohlhaas
fa46923b3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-30 08:06:29 +01:00
Laurent Destailleur
e013fa01a7 Fix: Revert direction of option (this information is a legal issue for 
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
 2012-10-29 11:38:32 +01:00
Laurent Destailleur
9d4471dd67 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
 2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be Fix: Better fix for import when field is computed by a function 2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Regis Houssin
82cb0802d0 Fix: broken feature, missing $page 
Fix: bad field name
 2012-10-28 02:14:08 +02:00
Laurent Destailleur
ee29c65708 Move stock import into stock module (stock module is at a low level than 
product)
 2012-10-27 20:27:07 +02:00
Laurent Destailleur
6c0fb9a1f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 20:04:03 +02:00
Laurent Destailleur
a7e35a9308 Fix: If we exclude dirs, we must also clean array to avoid to count 
them.
 2012-10-27 20:02:09 +02:00
Maxime Kohlhaas
bed17951b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-27 15:59:40 +02:00
Christophe Battarel
253e3412db fix wrong insert sql construction 
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
 2012-10-27 12:55:28 +02:00
Regis Houssin
6b07579620 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-27 11:30:36 +02:00
Regis Houssin
2bbfad2460 Fix: missing parameter 2012-10-27 11:30:08 +02:00
Laurent Destailleur
443f5ca03e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 00:23:54 +02:00
Laurent Destailleur
7a48351909 Fix: delete file from ecm module 2012-10-27 00:23:16 +02:00
Laurent Destailleur
833ada4732 Merge pull request #465 from simnandez/develop 
Fix: [ bug #579 ] Multi-Company and imports
 2012-10-26 11:00:52 -07:00
simnandez
9ada60afbc New: More import options. Products categories 2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66 New: More import options. Products categories 2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83 New: More import options. Products categories 2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c New: More import options. Customer and suppliers categories 2012-10-26 18:34:49 +02:00
simnandez
425ebae802 New: More import options. Products categories 2012-10-26 18:19:04 +02:00
Laurent Destailleur
0d48682eed Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-26 17:59:39 +02:00
simnandez
7aec227694 New: More import options. Products stocks 2012-10-26 17:52:53 +02:00
simnandez
970933ec7f Fix: [ bug #579 ] Multi-Company and imports 2012-10-26 17:29:41 +02:00
Regis Houssin
c521a77e92 New: add key generator in webservices admin page 2012-10-26 15:20:47 +02:00
Maxime Kohlhaas
fd5fb90649 Task # 559 : price defined on product page is unit price. Need to multiplicate this price by qty to have the right global price in the product list 2012-10-26 01:07:11 +02:00
Maxime Kohlhaas
fc7bc7e5d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-26 01:00:22 +02:00
Maxime Kohlhaas
0f1617c31d Task 559 : add use of price by qty in product selection (select and ajax search) 2012-10-26 01:00:03 +02:00
Regis Houssin
b5d70ad17f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1 New: add export filters (thank you Charles Benke) 2012-10-25 22:30:17 +02:00
simnandez
e89a06bb9c Fix: Bad ProfId assignation in imports 2012-10-25 17:08:25 +02:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Regis Houssin
4f1ef1bcf8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 15:01:26 +02:00
Regis Houssin
89b794dcd0 Fix: avoid errors with IE 2012-10-25 15:01:04 +02:00
Laurent Destailleur
a60516ae0d Fix: Show warning only if transaction level not correct 2012-10-25 14:16:06 +02:00
Laurent Destailleur
7b92f66fab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop
 2012-10-25 13:17:35 +02:00
Laurent Destailleur
daeb1029a1 New: Support field required or not 2012-10-25 13:11:55 +02:00
Laurent Destailleur
d142dec69a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-25 12:45:01 +02:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Laurent Destailleur
2953ef37e6 Methods works with most tables/elements 2012-10-25 10:06:29 +02:00
Regis Houssin
f8f1d3a0df Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement 
mode and paiement method in pdf
 2012-10-25 09:24:05 +02:00
Regis Houssin
1cbd2a1b1c Fix: broken feature 2012-10-25 08:45:35 +02:00
Regis Houssin
23707e2346 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0 Fix: strict mode 2012-10-24 22:50:19 +02:00
Laurent Destailleur
773b082b13 Fix: Restore private: The public method to use by external code is 
addExtraField.
 2012-10-24 21:28:24 +02:00
Laurent Destailleur
1b116c05ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-24 21:21:58 +02:00
Laurent Destailleur
d1a4a6a090 New: Support synchro of field job/title. 
New: Add script to synchronize users from ldap to dolibarr.
 2012-10-24 21:19:10 +02:00
Laurent Destailleur
afb94c5014 Fix: Avoid warning 2012-10-24 21:16:58 +02:00
Regis Houssin
abb5047979 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 18:41:51 +02:00
Regis Houssin
5c78b2d5dd Fix: possibility to use this function in external module class 2012-10-24 18:41:22 +02:00
Laurent Destailleur
0d92fe2de1 Normalize code 2012-10-24 17:32:10 +02:00
Laurent Destailleur
0b32b24eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-24 16:25:22 +02:00
Laurent Destailleur
2f4f427d9e Fix: ldap errors 2012-10-24 16:25:09 +02:00
fhenry
597ba3e6fc [ task #581 ] Implement function DDLInfoTable for PostgreSQL db class 2012-10-24 11:37:00 +02:00
Regis Houssin
1055cf4e53 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 10:19:46 +02:00
Regis Houssin
4f45ba8ff6 Fix: remove br 2012-10-24 09:56:31 +02:00
Laurent Destailleur
1999452701 Fix: Avoid warnings 2012-10-23 23:49:16 +02:00
Regis Houssin
30430953de Fix: missing row and col parameters 2012-10-23 09:33:07 +02:00
Laurent Destailleur
9589b84a1a Fix: No reason to start content of a cell with br 2012-10-22 19:30:49 +02:00
Regis Houssin
9bbea4f385 Fix: use span is better 2012-10-22 17:06:27 +02:00
Laurent Destailleur
eaad5f075e Fix: Some fix to removed refused controls by distrib package build 
systems.
 2012-10-22 13:08:55 +02:00
Regis Houssin
2f15857dab Fix: add mobile phone in contact list 
TODO: Fax is obsolete and not used by several companies
 2012-10-22 11:20:59 +02:00
Regis Houssin
6329344df2 Fix: broken features 
Fix: use entity O for all entities
 2012-10-22 09:15:08 +02:00
Laurent Destailleur
d56791d4dc Fix: Works with PHP 5.2 2012-10-22 00:43:59 +02:00
Laurent Destailleur
bba5057d5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-21 15:51:03 +02:00
Laurent Destailleur
fbb3ce63a7 Fix: PDF works with US executive format. 2012-10-21 15:50:53 +02:00
Laurent Destailleur
cb95621d7e Merge pull request #455 from simnandez/develop 
New: More import options. Thirds Bank Accounts
 2012-10-19 10:27:41 -07:00
Laurent Destailleur
ffa1b10061 doxygen 2012-10-19 14:45:00 +02:00
simnandez
aa53b7a2ba New: More import options. Thirds Bank Accounts 2012-10-19 13:00:53 +02:00
Laurent Destailleur
70cf195fb4 Fix: removed test code 2012-10-19 09:34:31 +02:00
Laurent Destailleur
657d0197b6 Fix: json is a fuck... sh... 3 hours to find a bug ! (json fails 
without any warning when converting non utf8 strings).
 2012-10-18 16:30:12 +02:00
Laurent Destailleur
0152e226c1 Fix: Use correct translation of fields 2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8 Merge pull request #453 from simnandez/develop 
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
 2012-10-18 03:31:55 -07:00
Regis Houssin
d705995a49 Fix: convert line delimiters 2012-10-18 10:36:53 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
97001951e6 New: Add field stock into product export 2012-10-17 20:32:57 +02:00
Laurent Destailleur
319b512157 Fix: Avoid empty messages 2012-10-17 19:02:21 +02:00
simnandez
d7dcd3c14b New: More import options. Supplier Products 2012-10-17 19:02:12 +02:00
Laurent Destailleur
c4ce66d784 Enhance error management 2012-10-17 18:47:18 +02:00
Laurent Destailleur
ef1e735ff9 Fix: doxygen 2012-10-17 17:19:28 +02:00
Laurent Destailleur
4d5a6c6f01 Typo error 2012-10-17 15:07:13 +02:00
Laurent Destailleur
01bd20147e Fix: Some fixes and enhancement into modularizing log functions 2012-10-17 14:46:20 +02:00
Laurent Destailleur
4a913cfb38 Merge pull request #449 from marcosgdf/odt-discounts 
Created function to retrieve total discounted amount of a commonobject
 2012-10-17 05:03:55 -07:00
Laurent Destailleur
05ca191335 Merge pull request #451 from marcosgdf/syslog 
Created a modular syslog handler system
 2012-10-17 05:03:14 -07:00
simnandez
23d3b6a783 New: More import options. Supplier Products 2012-10-17 12:36:30 +02:00
simnandez
6f430cc630 New: More import options. Supplier Products 2012-10-17 11:43:26 +02:00
simnandez
cf814dc7fd New: More import options. Categories 
Trad: Add es_ES and ca_ES missing translations
 2012-10-17 10:42:16 +02:00
simnandez
2cf88e7847 New: More import options. Categories 
Trad: Add es_ES and ca_ES missing translations
 2012-10-17 10:40:17 +02:00
Regis Houssin
26a5ac53d7 Fix: possibility to disable ajax 2012-10-16 16:10:23 +02:00
Marcos García
3c051abc22 Orders and proposals should also replace {object_total_discount} 2012-10-16 13:43:50 +02:00
Marcos García
ac4ee01723 mod_syslog_syslog class shouldn't be active if openlog is not available 2012-10-16 13:39:23 +02:00
Marcos García
df2262f8be Stopped using (un)serialize functions but json functions 2012-10-16 12:18:05 +02:00
Marcos García
180eddff49 Because the rest of the class is using SYSLOG_CHROMEPHP_INCLUDEPATH it needs to be restored... 2012-10-16 02:25:48 +02:00
Marcos García
f250bb41e9 Removed unnecessary comments and commented unused config variables 2012-10-16 02:13:38 +02:00
Marcos García
07dcb07fd2 Created a modular syslog handler system 
I've split all log handlers into classes so that people can make
new log handler systems without making changes to the core.
Also, now every log handler can handle how and what will be logged.
 2012-10-16 02:01:37 +02:00
Laurent Destailleur
5dff8dbc6d New: Avoid horizontal scroll on standard resolution. 2012-10-15 23:13:28 +02:00
Marcos García
c9944a6b9b Created function to retrieve total discounted amount of a commonobject 
Also added an ODT tag to let people add it to their invoices, etc..
 2012-10-15 00:49:39 +02:00
Marcos García
59e8964bc5 Fixed PHP warning on MailmanSPIP module 
Also simplified the code and removed unused variables from it
 2012-10-14 23:56:28 +02:00
simnandez
6f799f8e16 New: More import options. Warehouses 2012-10-13 18:02:43 +02:00
Laurent Destailleur
153997432f Fix: Several fix. 
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
 2012-10-13 17:00:38 +02:00
Regis Houssin
df1e4a401a Fix: convert line delimiters 
Info: the last Eclipse version fix this problem
 2012-10-13 11:42:58 +02:00
Laurent Destailleur
6046feda11 Restore border into PDF 2012-10-11 09:42:47 +02:00
Regis Houssin
10bd942328 Fix: customer ref is very important for a best traceability 2012-10-10 12:04:08 +02:00
Laurent Destailleur
8b4886073c Fix: Removed the FIXME. This is supported by the pgsql driver. 2012-10-09 12:03:39 +02:00
Regis Houssin
044ec61aba Merge pull request #446 from atm-maxime/develop 
Task # 186 : Forgot to add the new box in the mod definition...
 2012-10-08 23:50:49 -07:00
Maxime Kohlhaas
67dbae4486 Correction for new box inclusion 2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9 Task # 186 : Forgot to add the new box in the mod definition... 2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91 Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits 2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-08 19:27:02 +02:00
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Laurent Destailleur
6873e93b7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
 2012-10-05 08:30:09 +02:00
simnandez
f873198442 Fix: Warning into perms page 2012-10-04 18:40:05 +02:00
simnandez
caef97dc08 Task # 104: Check if module invoice is active and user has creation 
permissions. Move creation invoice to action bar into customer card
 2012-10-04 18:23:21 +02:00
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Laurent Destailleur
5c6b0c064e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b New: Support removing tab into member module 2012-10-04 15:37:10 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
4b27a9215b Fix: Show message only when needed 2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Laurent Destailleur
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +02:00
Laurent Destailleur
2617fc21a6 Some fix: List of invoices to show in "to bill" menu must contains 
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
 2012-10-03 11:43:39 +02:00
simnandez
921795e562 Task # 104 : Remove MAIN_FEATURES_LEVEL 2012-10-03 09:16:27 +02:00
Regis Houssin
fc1cc95d08 Fix: bad path 2012-10-03 08:54:21 +02:00
Laurent Destailleur
c25e908b75 Doxygen 2012-10-03 00:30:50 +02:00
Maxime Kohlhaas
89e14043a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-02 11:01:21 +02:00
Spangaro Alexandre
3ae6117e16 Reintegrate accounting.php in admin 2012-10-02 06:07:57 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559 
Task # 559 : add discount on supplier prices
 2012-10-01 13:31:17 -07:00
Maxime Kohlhaas
1aa3156958 Task # 186 : new box of products with stock alert 2012-10-01 16:44:38 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a Fix: doxygen 2012-09-30 20:49:13 +02:00
Laurent Destailleur
9db72fb50d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
Christophe Battarel
15d7266abf import : add csv options (separator and enclosure) 2012-09-28 10:23:04 +02:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility 
Qual: Removed deprecated code
 2012-09-27 23:54:47 +02:00
Laurent Destailleur
e94ddde91d Fix: Patch calculation field odt 2012-09-27 21:08:32 +02:00
Laurent Destailleur
a98de7ef02 Fix: No error when hour not provided 2012-09-27 13:25:31 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode 
Fix: strict mode bubbles
 2012-09-27 11:57:46 +02:00
Laurent Destailleur
051b93c73b Qual: Code cleaner using field name instead of index number. 
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
 2012-09-27 00:05:13 +02:00
Regis Houssin
e9de123036 Fix: hide menu if empty 2012-09-26 12:09:14 +02:00
Regis Houssin
d08e66b0b8 Fix: add member module compatibility 2012-09-26 10:43:15 +02:00
Regis Houssin
817e653519 Fix: add todo for free tag treatment 2012-09-25 18:31:08 +02:00
Christophe Battarel
67333522b0 add ability to remove a product tab if it's defined in a module description 2012-09-25 14:42:58 +02:00
Laurent Destailleur
043e5edc2c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-24 21:37:36 +02:00
Laurent Destailleur
7d83fdce5b Fix: Several fixes into date functions 
Qual: Add PHPUnit tests
 2012-09-24 21:37:19 +02:00
Regis Houssin
9792d5a289 Fix: use company name if firstname and lastname not exists 2012-09-24 12:12:37 +02:00
Regis Houssin
c268a62cab Fix: try to disable 1900 test 2012-09-24 09:30:37 +02:00
Laurent Destailleur
a6b2eab439 Revert bad fix. 
Unit tests are back ok (when tag is @6 or @=, yearoffset
is not zero but must not be applied when replacing yyyy). 
Compatibility with 3.2 is also restored.
 2012-09-23 22:09:54 +02:00
Laurent Destailleur
0741b907ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-23 22:03:08 +02:00
Laurent Destailleur
0c1651dbf3 Doxygen 2012-09-23 22:02:44 +02:00
Regis Houssin
d147c360d3 FIXME: this code is useless, $yearoffset is 0 by default 2012-09-23 17:05:08 +02:00
Laurent Destailleur
7fac6b65f6 Fix: Fix for compatibility with previous version and for case "@=". 
Qual: Add a lot of phpunit tests to validate all get_next_value()
cases.
 2012-09-23 16:25:08 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Regis Houssin
e721c6e723 Fix: more simple too 2012-09-22 10:40:12 +02:00
Regis Houssin
1e3cecf25c Fix: can use {yy}{mm} or {mm}{yy} 2012-09-22 10:33:25 +02:00
Regis Houssin
6151bc3a42 Fix: more simple 2012-09-22 09:18:36 +02:00
Regis Houssin
eee4434850 Fix: update doc 2012-09-22 09:03:38 +02:00
Regis Houssin
d48f494eb0 Fix: check fiscal date and new year 2012-09-22 08:53:10 +02:00
Regis Houssin
ba1b282c3b Fix: remove unused code 2012-09-21 11:28:28 +02:00
Regis Houssin
50b0dcf47e New: try to use new tag 2012-09-21 11:23:31 +02:00
Laurent Destailleur
5e9cd37107 Uniformise look of PHP Info page. 2012-09-21 00:13:20 +02:00
Laurent Destailleur
408a4553ee Help center at end (because we leave software) 2012-09-20 22:54:05 +02:00
Laurent Destailleur
05e20b8f30 New: Can exclude some type of events 2012-09-20 00:42:51 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Regis Houssin
98b38628c5 Fix: optimizing 2012-09-19 17:24:40 +02:00
Laurent Destailleur
cd3d01127c Merge pull request #404 from grandoc/develop 
fix: Warning : Invalid argument supplied for foreach()
 2012-09-19 07:40:43 -07:00
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +02:00
Grand Philippe
aa7cd880c0 fix: Warning : Invalid argument supplied for foreach() 2012-09-19 15:07:06 +02:00
Laurent Destailleur
533e285dad Merge pull request #403 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-09-19 05:53:43 -07:00
Laurent Destailleur
9bc0011290 Merge pull request #405 from cbattarel/develop 
correct some ajax bugs caused by tpl recent updates
 2012-09-19 05:53:29 -07:00
Laurent Destailleur
a68483d72f Uniformize code. 2012-09-19 14:49:13 +02:00
Laurent Destailleur
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +02:00
Laurent Destailleur
d1cfe2ec54 Fix: Bug when metafile is on 2012-09-19 13:30:59 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +02:00
Christophe Battarel
de93c819f4 correct some ajax bugs caused by tpl recent updates 2012-09-19 12:02:06 +02:00
Laurent Destailleur
60fc0f2b74 Removed warning 2012-09-19 11:56:50 +02:00
Grand Philippe
2bcbd7dc2a fix: Warning : Invalid argument supplied for foreach() 2012-09-18 18:00:05 +02:00
simnandez
dd9d3c8ba4 Fix: localtaxes must display in pdf even if they are in negative 2012-09-18 17:57:52 +02:00
simnandez
76f3fb56ea Fix: Add type of product/service into propals for a correct localtaxes 
calculation
Fix: Localtax2_type for Spain must be 3
 2012-09-18 16:06:45 +02:00
Laurent Destailleur
889f71db6f Fix: Color of lines must be set for each lines 2012-09-18 12:52:54 +02:00
Laurent Destailleur
4065b52441 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-17 22:05:36 +02:00
Laurent Destailleur
4a98c08a74 Fix: Use correct date timezone. 2012-09-17 22:05:13 +02:00
Regis Houssin
8bab5fdadd Fix: convert line delimiters 2012-09-17 19:37:02 +02:00
Regis Houssin
58ae3b9372 Fix: possibility to disable hook 2012-09-17 19:36:43 +02:00
Regis Houssin
dc7100677a Fix: avoid warning if no object 2012-09-17 16:28:37 +02:00
Laurent Destailleur
ef4831d119 Solved FIXME. I keep the code but commented, to keep source the more 
similar as possible than invoices.
 2012-09-17 11:46:50 +02:00
Regis Houssin
16ad953d10 Fix: best practice 2012-09-17 08:13:29 +02:00
Regis Houssin
80eceab230 Fix: restore broken features 2012-09-17 07:15:38 +02:00
Regis Houssin
10b122578e FIXME: $deja_regle not use in proposal? 2012-09-17 06:52:33 +02:00
Regis Houssin
bf008c7640 Fix: optimizing 2012-09-17 06:43:58 +02:00
Laurent Destailleur
cd6a8fa761 New: Uniformize code 2012-09-17 02:07:14 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code 
New: Can use extrafields on contacts/addresses.
 2012-09-17 01:39:30 +02:00
Laurent Destailleur
2170801fd2 New: Uniformize pdf generation code. We also keep space to repeat pdf 
head info.
 2012-09-17 00:43:23 +02:00
Laurent Destailleur
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +02:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00
Laurent Destailleur
b724a78cb3 Fix: Debug dictionnary to add localtaxes 2012-09-16 15:04:55 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2012-09-15 13:53:19 +02:00
Laurent Destailleur
4566595d44 Fix: W3C when module margin is on 2012-09-15 13:44:40 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Regis Houssin
4220229573 Fix: minor change 2012-09-14 15:56:50 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Regis Houssin
968380ba3e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-13 18:50:29 +02:00
Laurent Destailleur
46ee00fc5e A party to fish bugs and merou. 2012-09-13 18:28:03 +02:00
Regis Houssin
f902fedbb8 Fix: split for more possibility 2012-09-13 17:43:24 +02:00
Laurent Destailleur
af5507bcfa Fix: restore correct behaviour. Space is output only if there is an img 
+ text. img alone is not enough.
 2012-09-13 16:13:12 +02:00
Regis Houssin
7eef637776 Fix: strict mode killer 2012-09-13 11:52:50 +02:00
Laurent Destailleur
ed61508b3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-13 10:14:47 +02:00
Laurent Destailleur
4cc56f0176 New: Extra fields supports more types (now int, string, double, date, 
datetime)
 2012-09-13 10:14:25 +02:00
Regis Houssin
6561694658 Fix: invert space 2012-09-13 10:03:58 +02:00
Regis Houssin
1fa84aa92b Fix: better 2012-09-13 10:02:45 +02:00
Regis Houssin
9130dbda4e Fix: wrong space 2012-09-13 09:57:12 +02:00
Regis Houssin
b1e01b50f5 Fix: use warning icon for limit size of tab 
Fix: optimizing textwithtooltip method
 2012-09-13 09:52:03 +02:00
Laurent Destailleur
d5e8037483 Merge pull request #395 from marcosgdf/translations 
Improved translations
 2012-09-12 11:08:55 -07:00
Regis Houssin
5770245805 Fix: rename the hook 2012-09-12 19:37:37 +02:00
Marcos García
cb4044755b Fixed export translations 
Added missing strings
Corrected some translations
 2012-09-12 19:11:03 +02:00
Regis Houssin
28e5ba6c18 Fix: mini strict mode 2012-09-12 18:47:06 +02:00
simnandez
2e37084c55 Fix: If price is 'TTC' we need to have the totals without VAT for a 
correct
calculation
Fix: The updateline of propal must include the localtaxes totals
 2012-09-12 17:48:45 +02:00
Laurent Destailleur
dd66ebd3f6 New: Use GB address format 2012-09-12 17:39:02 +02:00
Laurent Destailleur
040dd09f5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 17:25:01 +02:00
Regis Houssin
b78b0830d1 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-12 14:56:23 +02:00
Regis Houssin
664ceb7f2c Fix: This is a 'superglobal', there is no need to do 'global $variable;' 
to access it within functions or methods.
 2012-09-12 14:55:39 +02:00
Laurent Destailleur
c9678e3f1d Merge pull request #391 from marcosgdf/minor 
Fixed xinputuser emailing module
 2012-09-12 05:53:12 -07:00
Regis Houssin
a2f1107bfc Fix: add GET in hook parameters 2012-09-12 14:49:36 +02:00
Marcos García
98092b952d Fixed xinputuser emailing module 
Lastname wasn't being recorded
 2012-09-12 14:49:02 +02:00
Laurent Destailleur
ce1b759c47 Merge pull request #390 from cbattarel/develop 
use selected value in contact type list + remove duplicate print statement
 2012-09-12 04:18:32 -07:00
Laurent Destailleur
71c25bb939 Hide not frequently used third level menus entries. 2012-09-12 13:01:20 +02:00
Christophe Battarel
8111909340 use selected value in contact type list + remove duplicate print statement 2012-09-12 12:55:45 +02:00
Regis Houssin
7358223c8f Fix: convert line delimiters 2012-09-12 12:41:44 +02:00
Regis Houssin
b75efdcf10 Fix: regression, replace triggers by hooks 2012-09-12 12:27:11 +02:00
Laurent Destailleur
8fd384373a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 10:57:09 +02:00
Regis Houssin
2557320f8d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-12 10:47:17 +02:00
Regis Houssin
71d5191ff7 Fix: duplicate parameters 2012-09-12 10:46:35 +02:00
Stephen L
8fcf20227a Fix: definition of all substitution functions is no more required 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-09-11 20:15:03 +02:00
Laurent Destailleur
54be534506 Add comment and renamed file to be sure new function is not called 
directly. Not sure it's a good idea to have dolDeleteFile separated
since it must be called only by dol_delete_file.
 2012-09-11 20:06:37 +02:00
Regis Houssin
b39c9c514a Fix: split into 2 functions 2012-09-11 18:52:23 +02:00
Regis Houssin
3e033ef48c Fix: doc 2012-09-11 17:09:43 +02:00
Regis Houssin
1d6645c5c4 Fix: rename this method 2012-09-11 17:08:29 +02:00
Regis Houssin
f95d611f12 New: add hooks in dol_delete_file and list_of_documents methods 2012-09-11 17:08:10 +02:00