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

710 Commits

Author SHA1 Message Date
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
3551dff18a Fix: [ bug #671 ] Product country origin is automatically entered in 
description of invoices, but not in invoices generated from orders
 2013-01-19 15:57:28 +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
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
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
a7ed40b10d Fix: empty value if combobox disabled 2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371 Fix: empty value if combobox disabled 2013-01-09 10:40:36 +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
Laurent Destailleur
df43d477fc Merge pull request #562 from simnandez/3.3 
Fix: Supplier is mandatory into adding invoice suppliers
 2012-12-30 08:38:34 -08:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
simnandez
f05176dc8a Fix: Date is mandatory into adding customer orders 2012-12-30 10:49:11 +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
Christophe Battarel
b68153ce9a add button in order to create intervention from services ordered 2012-12-05 19:07:07 +01:00
Christophe Battarel
e8e4cc08de show localtaxes in order 2012-11-28 10:35:16 +01:00
Laurent Destailleur
0d48682eed Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-26 17:59:39 +02:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Christophe Battarel
135342b085 fix minor bugs in order creation from another object 2012-10-25 15:47:35 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +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
Laurent Destailleur
0dfc9e59fe New: Creation of meta file works for all elements. Disabled by default. 2012-09-07 10:30:02 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +02:00
Regis Houssin
18b7549c52 Fix: use GETPOST('usenewaddlineform') instead MAIN_FEATURES_LEVEL 2012-08-31 08:51:08 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Regis Houssin
62a7847c5b Fix: [ task #498 ] debug 2012-08-28 15:35:32 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Marcos García
29f2e7236a Forgot to migrate to some lines to the new error-handler 2012-08-16 21:37:33 +02:00
Marcos García
db5d046ee7 Applied 3.3 error management as @hregis requested 2012-08-16 13:10:14 +02:00
Marcos García
b4471a4bd7 Added missing error messages in supplier & customer's orders 2012-08-15 15:52:51 +02:00
Laurent Destailleur
377b1716ef Fix: permission execute on perl script 
Fix: Checkstyle
 2012-08-04 00:17:34 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Regis Houssin
1591a5ac3b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 15:47:40 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Laurent Destailleur
e8b2489c1c Checkstyle 2012-07-29 15:28:39 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Marcos García
90963ca84a BackToList links in Client orders section 2012-07-28 20:54:07 +02:00
Regis Houssin
1dd14d35f7 Fix: add null value in class method 2012-07-28 18:32:54 +02:00
Marcos García
bb8dd6ded6 Fixed 2 fatal errors in commande/fiche.php and a SQL problem too 2012-07-28 16:22:01 +02:00
Regis Houssin
3390a514e1 Fix: include wrong class 2012-07-28 09:57:04 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Regis Houssin
6a69b55e5e Fix: tabulation 2012-07-27 14:10:56 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-07-25 12:20:45 +02:00
Regis Houssin
e12604cb71 Fix: avoid warning and strict mode story 2012-07-25 09:09:56 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
d32091120b margin management for orders 2012-07-19 10:26:26 +02:00
Laurent Destailleur
73b17dc4c5 New: Make things more clear. 2012-07-17 15:28:34 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved. 
Fix: Validate of shipment in error
when using not predefined products.
 2012-07-17 01:22:19 +02:00
Regis Houssin
69ebda8ddb Fix: regression corrected 2012-07-08 12:18:29 +02:00
Regis Houssin
3bfd9182e0 Fix: uniformize code 2012-07-06 13:43:59 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
cc18dab5c9 Fix: missing remove_file action 
Fix: use object instead id and store odt filename in object for use in
triggers
 2012-06-10 17:09:10 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external 
modules
 2012-05-30 00:07:06 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view 
wrapper.
 2012-05-29 23:50:13 +02:00
Regis Houssin
9cf2ea492c Fix: broken features with external module 2012-05-21 18:44:09 +02:00
juanjo
a6b0242f8a [ task #407 ] Manage PDF hidden items 2012-05-21 17:12:57 +02:00
Regis Houssin
8ec51c2a6b Fix: fetch object for hookmanager 2012-05-10 19:30:10 +02:00
FHenry
4e759b15fe Correction Bug #358 2012-04-11 10:03:57 +02:00
Laurent Destailleur
f482ba18c3 Fix: We keep notes 2012-04-07 18:28:03 +02:00
Laurent Destailleur
c77bc5adf5 Doxygen 2012-03-31 15:42:33 +02:00
Laurent Destailleur
daf2a19396 New: Add signature at end of predefined email text 2012-03-28 00:56:12 +02:00
Laurent Destailleur
0fd372e5da Trans: Update language files 
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
 2012-03-22 23:52:02 +01:00
Regis Houssin
808c4b5732 New: testing a new method to avoid reloading the page 2012-03-18 14:06:55 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Regis Houssin
281c6b7f2a New: sharing code of contact and note tabs 2012-03-17 16:05:58 +01:00
Regis Houssin
0df083a8d8 Fix: update security 2012-03-16 10:55:29 +01:00
Regis Houssin
dae20441d0 Fix: add template for view/edit notes in object card and add possibility 
to show/hide this bloc
 2012-03-16 09:39:32 +01:00
Laurent Destailleur
245edb8596 Fix: Maxi debug on sending document by email. Works now with odt too. 2012-03-16 00:34:41 +01:00
Regis Houssin
a1085f9c9c Fix: missing public note and private note 2012-03-15 08:17:47 +01:00
Regis Houssin
fea476d14b Fix: remove unused class 2012-03-14 08:00:56 +01:00
Regis Houssin
ba15a73831 Works on an alternative address management 2012-03-14 07:49:41 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3 Fix: move method in common class 2012-03-13 19:24:11 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Regis Houssin
b745eb1e05 Fix: wrong object 2012-02-27 08:02:59 +01:00
Laurent Destailleur
de187ab398 Try a better fix 2012-02-25 16:14:41 +01:00
Regis Houssin
19f53e6caa Fix: default customer language problem 2012-02-25 11:10:38 +01:00
Regis Houssin
ea83e474dc New: add possibility to linked other objects from external modules 2012-02-22 01:19:05 +08:00
Laurent Destailleur
475bba2ea7 Qual: Reduce size of form.class 2012-02-20 12:20:56 +01:00
Regis Houssin
f0d2823edf Fix: avoid foreach warning 2012-02-06 18:59:07 +01:00
Laurent Destailleur
6cb0685b6f Qual: Uniformize hook names. All hooks to add information on 
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
 2012-02-06 17:18:19 +01:00
Christophe Battarel
6a90298af0 affiche libellé produit dans la langue du client en plus de la description (variable de conf renommée en PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE 2012-01-16 17:12:29 +01:00
Christophe Battarel
5524d42ddb ajout commentaires entete oubliés sur ajout description produit dans la langue du client 2012-01-16 10:35:36 +01:00
Regis Houssin
9fe45c4f4f Fix: uniform code 2012-01-13 17:46:15 +01:00
Christophe Battarel
69c9edbeb3 ajoute la possibilité de visualiser la description des produits dans la langue du client lors de l'jout de lignes dans les commandes/propales/factures 2012-01-13 16:53:28 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00