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

3865 Commits

Author SHA1 Message Date
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
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
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
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