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
aspangaro
be78e96313 Bug fix & add tab info 2014-07-05 08:47:01 +02:00
Laurent Destailleur
faa5eba203 Fix: Substitution for external module at wrong place. 2014-07-04 18:43:37 +02:00
KreizIT
c5bb55064f Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message 2014-07-04 17:10:19 +02:00
KreizIT
e4ad082214 Fix: [ bug #1506, #1507 ] ECM trigger error problem 2014-07-04 16:39:54 +02:00
KreizIT
4666de85e2 Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message 2014-07-04 16:18:54 +02:00
KreizIT
012fc4e8fe Fix: [ bug #1465, #1466 ] Product triggers problem 2014-07-04 15:54:20 +02:00
Florian HENRY
b8c293fb16 $dateSelector is a paramters of formAddObjectLine, if use global it is 
reset to 0 because not declare in outer context but already exists in
the same context.
 2014-07-04 14:48:27 +02:00
Laurent Destailleur
8e2999f73f Fix: phpcs 2014-07-04 14:19:03 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Laurent Destailleur
8c306a968f Merge pull request #1704 from KreizIT/review_trig 
Review user trigger
 2014-07-04 13:20:32 +02:00
Juanjo Menent
3679a4ba90 [ task #1063 ] Allow edit localtaxes rate for thirds. Works documents 
pdf
 2014-07-04 13:11:51 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Juanjo Menent
747b6a9f94 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports 
and payments
 2014-07-04 12:50:55 +02:00
aspangaro
a2ac578712 Merge branch 'Upstream/develop' 2014-07-04 06:21:00 +02:00
Juanjo Menent
24b2b83b85 use count() instead sizeof() 2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with company 2014-07-03 17:39:31 +02:00
KreizIT
023e7ce8ce FIX : [ bug #1502 ] DON_CREATE trigger does not intercept trigger action 
- Add DON_CREATE in interface_90_all
- Add new trigger DON_UPDATE, DON_DELETE
 2014-07-03 16:04:12 +02:00
KreizIT
538cf90f5e FIX : [ bug #1496 ] ACTION_DELETE trigger does not show trigger error 
-Add ACTION_* trigger in interface_90_all
 2014-07-03 15:39:40 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
d8b9cdf5c2 Merge pull request #1692 from atm-maxime/develop 
New : remaining to shipon delivery PDF
 2014-06-29 23:45:38 +02:00
Laurent Destailleur
31c27b8f7c New: More option to define default filter setting of agenda views. 2014-06-29 23:35:00 +02:00
aspangaro
46320071a0 Merge branch 'Upstream/develop' 2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d Update 2014-06-29 05:41:24 +02:00
Laurent Destailleur
6f0250cb94 Fix: typo 2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9 New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
Maxime Kohlhaas
7d16f62a9d New : add remaining to ship on delivery PDF 2014-06-28 22:48:20 +02:00
Laurent Destailleur
6916d251b5 New: Can filter events on a group of users. 2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3 New: Can create proposal from an intervention. 2014-06-28 19:47:51 +02:00
Laurent Destailleur
a8e4391887 Prepare calendars to be able to show calendars with selection on several 
users.
 2014-06-28 18:04:32 +02:00
Maxime Kohlhaas
d61e5bae93 Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related 2014-06-28 17:01:52 +02:00
Laurent Destailleur
2c493a4fe3 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
Laurent Destailleur
7d72b6c3a1 Add comments 2014-06-28 14:06:29 +02:00
Laurent Destailleur
e5a06635dc Fix css for agenda box 
Make different view of agenda into different tabs.
 2014-06-27 20:50:46 +02:00
Laurent Destailleur
4cd3a4f4aa Fix: bad indice 2014-06-27 01:34:27 +02:00
Laurent Destailleur
29dfb71bbd Merge branch 'patch-11' of github.com:defrance69/dolibarr into 
defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php
 2014-06-26 23:04:26 +02:00
Laurent Destailleur
092d1b725d Merge pull request #1684 from KreizIT/triggers 
FIX #1460, #1461
 2014-06-26 22:59:55 +02:00
BENKE Charles
8acd702cd1 Using hidden constant to use the feature 
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
 2014-06-26 22:34:40 +02:00
Laurent Destailleur
f25bb79d80 Merge pull request #1672 from defrance69/patch-19 
Add project and task boxes
 2014-06-26 22:03:38 +02:00
Laurent Destailleur
534e574379 Merge pull request #1668 from aspangaro/develop-dons 
Move donation receipt to french model cerfa 11580*03
 2014-06-26 22:03:13 +02:00
Laurent Destailleur
656dd94011 Merge pull request #1657 from mkdgs/patch-1 
Add customers/supplier status fo contact export
 2014-06-26 21:58:23 +02:00
Laurent Destailleur
79dec7ad90 Merge pull request #1641 from defrance69/patch-17 
Patch 17
 2014-06-26 21:43:45 +02:00
Laurent Destailleur
a2f610ffbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a Merge pull request #1686 from KreizIT/movetrig 
Fix [ bug #1459 ]
 2014-06-26 21:01:48 +02:00
Laurent Destailleur
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +02:00
Laurent Destailleur
2deadea40a New: Filter on event status 2014-06-26 20:24:00 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
KreizIT
92f1778c9d Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error 
Start refactoring trigger call from within object
 2014-06-25 16:51:26 +02:00
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Laurent Destailleur
f64f0d6933 Fix: If showempty is 0 and empty, do not show button. 2014-06-24 23:43:53 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
0c382ef97e Remove failure test on trigger 2014-06-24 10:55:21 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
aspangaro
56785f1149 Merge branch 'Upstream/develop' 2014-06-24 06:10:47 +02:00
Laurent Destailleur
c18d7de7b0 Fix: Use bad var for test 2014-06-22 13:33:31 +02:00
Laurent Destailleur
0778d38b2c Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:08:32 +02:00
Laurent Destailleur
62b0d8a472 Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:03:01 +02:00
Laurent Destailleur
dce0c38533 Fix: Add hidden option so we can restore old behaviour (duration is 
free) for people that can't work with new one.
 2014-06-21 16:06:59 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
BENKE Charles
fa75ef3b57 made change on all the modules_element definition 2014-06-21 00:35:11 +02:00
BENKE Charles
b34947b37c fix travis error 2014-06-21 00:08:13 +02:00
BENKE Charles
496379ced8 fix travis error 2014-06-20 23:56:03 +02:00
BENKE Charles
24e780cb0c Update box_task.php 2014-06-20 23:39:43 +02:00
BENKE Charles
a31d5cc193 Update box_project.php 2014-06-20 23:38:15 +02:00
BENKE Charles
8070030c45 Update box_project.php 2014-06-20 23:19:57 +02:00
BENKE Charles
ec1a6e1c29 Update box_task.php 2014-06-20 23:17:26 +02:00
Laurent Destailleur
69c518a483 Merge pull request #1677 from guerinaxel/patch-6 
LDAP Authentication faulty
 2014-06-20 17:14:02 +02:00
Laurent Destailleur
a72c3d4381 Merge branch 'develop' of github.com:atm-maxime/dolibarr into 
atm-maxime-develop

Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2014-06-20 17:11:12 +02:00
guerinaxel
cc0d91bf2b LDAP Authentication faulty 
The LDAP Authentication only test the POST authentication however we're allowed to authenticate using the function (for example via WebServices).
 2014-06-20 17:00:06 +02:00
Laurent Destailleur
2dc3e5b104 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger (Add a protection to avoid multiple errors).
 2014-06-20 16:20:39 +02:00
Laurent Destailleur
a2724822d7 Fix: Add hidden option to partially fix a bug. A more complete fix 
should be done later.
 2014-06-20 16:01:08 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
e2afa6853b Fix: Deletion of translation has disappeared. 2014-06-20 15:05:39 +02:00
Maxime Kohlhaas
dd83a52fb1 Fix : project list was showing all projects instead of company project. This wasn't matching the function comments. 2014-06-20 13:59:50 +02:00
Laurent Destailleur
a2065d0b6a Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a 
supplier order.
 2014-06-20 13:49:59 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Laurent Destailleur
6740e0321a Merge pull request #1670 from FHenry/3.5 
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
 2014-06-20 13:16:11 +02:00
Laurent Destailleur
51eb761b02 Merge pull request #1669 from aspangaro/develop-patch1 
Correction on 3.6beta
 2014-06-20 13:12:39 +02:00
Laurent Destailleur
8819f3e6e2 Merge pull request #1666 from atm-maxime/develop 
Fix : duedate was not auto calculated + move calculation function to com...
 2014-06-20 13:11:22 +02:00
Laurent Destailleur
3791175536 Fix: doxygen 2014-06-20 13:07:15 +02:00
Laurent Destailleur
221d7b56aa Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:52:08 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236 Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
 2014-06-20 12:41:23 +02:00
Laurent Destailleur
d3c5e93399 Fix: Menu entries not visible 2014-06-20 12:01:14 +02:00
BENKE Charles
754b028ec6 Update box_project.php 2014-06-18 22:19:28 +02:00
BENKE Charles
31c2815d0f Update box_task.php 2014-06-18 21:50:17 +02:00
BENKE Charles
66dc82621d Update modProjet.class.php 
add boxe definition on projet module
 2014-06-18 21:37:56 +02:00
BENKE Charles
c963a6d8a1 Create box_project.php 
add box for project
 2014-06-18 21:36:00 +02:00
BENKE Charles
ff31fff2d7 Create box_task.php 
add boxes of tasks
 2014-06-18 21:34:18 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
aspangaro
e469755d29 Divers 2014-06-16 06:17:46 +02:00
aspangaro
f4efd3b2e8 Move donation receipt to french model cerfa 11580*03 2014-06-15 22:18:19 +02:00
Maxime Kohlhaas
19a3194b02 Fix : duedate was not auto calculated + move calculation function to common invoice class 2014-06-14 12:53:02 +02:00
Florian HENRY
42e6727e5d Better error return 2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Florian HENRY
aecede08c4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-13 14:38:44 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
74ee3e9823 Improved SQL error logging 2014-06-13 01:52:57 +02:00
Marcos García de La Fuente
2e2cecb6c7 Undefined constant 2014-06-13 01:48:11 +02:00
Marcos García de La Fuente
0ed2481a20 Removed unuseful errors 2014-06-13 01:46:27 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Florian HENRY
40a5d20cc8 Do not reset index on product import !!! 2014-06-12 16:46:20 +02:00
Laurent Destailleur
b4ef780274 Fix: When project was disabled, label was not visible 2014-06-12 15:41:00 +02:00
Florian HENRY
f796a6408e Do not display dictionnay for non activated module 2014-06-12 15:28:11 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
d1d4c6d8a5 Increased SQL Error to LOG_ERROR level 2014-06-12 11:45:32 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Mickael Desgranges
57b4cb08b7 Update modSociete.class.php 2014-06-11 13:28:31 +02:00
Mickael Desgranges
81e715f34c Update modSociete.class.php 2014-06-11 12:26:54 +02:00
Mickael Desgranges
84f1b8c02b Add customers/supplier status fo contact export 
When you export a contact list it's usefull to know if your contact is a prospect, client or supplier
 2014-06-11 12:22:24 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d Fix: Confusion between is_int and is_numeric. 2014-06-09 15:21:20 +02:00
Laurent Destailleur
9ba4b53a88 Merge pull request #1645 from FHenry/3.5 
Start fix [ bug #1437 ] Securitu Issue
 2014-06-09 15:10:55 +02:00
Laurent Destailleur
8d8ca154f1 Fix: For supplier order/invoice, deselect product when free line is 
selected.
 2014-06-09 14:58:58 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue 
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
 2014-06-09 12:34:10 +02:00
Laurent Destailleur
48cdd3c13f Fix: extra fields key. 2014-06-06 16:08:42 +02:00
Laurent Destailleur
2ec4c56f6b Merge pull request #1640 from FHenry/3.5 
3.5
 2014-06-06 15:34:57 +02:00
BENKE Charles
f806b4373a Update modules_commande.php 
don't display specific version
 2014-06-06 15:30:33 +02:00
BENKE Charles
37c908aa99 Update modules_propale.php 
don't display specific number of version
 2014-06-06 15:29:45 +02:00
Laurent Destailleur
768163c6fc Fix: Easy fix to solve pb with pagebreak when adding image 2014-06-06 12:57:12 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Laurent Destailleur
905f700136 Fix: Pb with pagebreak when adding image 2014-06-06 11:57:45 +02:00
Laurent Destailleur
c45aace9b9 Add easy fix to solve pb of links for some modules. 2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63 Fix: Missing global 2014-06-05 22:42:49 +02:00
Florian HENRY
ebe49b0525 Same bug, missing select column use in result 2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158 Fix warining message during societe activation 2014-06-05 10:53:00 +02:00
Marcos García de La Fuente
4c11e37203 Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text 2014-06-03 15:45:03 +02:00
aspangaro
bb4fed30a8 Salaries :: Missing key language & typo 2014-06-03 06:45:37 +02:00
Florian HENRY
0de66e838c camel case 2014-05-30 12:01:26 +02:00
Laurent Destailleur
fb0f0047e7 Merge pull request #1633 from aspangaro/develop 
Typo / Missing key language / Fix limit list on mass movement stock page
 2014-05-30 11:33:08 +02:00
Laurent Destailleur
82a2a723c3 Fix: [ bug #1419 ] Margins module shows margin of sold services even if 
services module is disabled
 2014-05-29 21:01:00 +02:00
Laurent Destailleur
56d71f0da0 Fix: edit form 
Fix: pgsql driver
 2014-05-29 19:56:15 +02:00
Laurent Destailleur
b75dea98ee Fix: sql syntax 2014-05-29 19:46:32 +02:00
Laurent Destailleur
7a670c5bc7 Fix: pgsql driver not complete 
Conflicts:
	htdocs/core/db/pgsql.class.php
 2014-05-29 19:39:34 +02:00
Laurent Destailleur
e8ec0f524f Fix: pgsql driver not complete 2014-05-29 19:30:51 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Florian HENRY
f87772f3ec Add comment for travis 2014-05-29 14:56:55 +02:00
Florian HENRY
d15c3b2c23 CRLF 2014-05-29 14:30:09 +02:00
Florian HENRY
d304c7785e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/pomme.modules.php
 2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711 Better target emailing status mangement 2014-05-29 14:26:27 +02:00
aspangaro
e856e64bc9 Typo 2014-05-28 06:17:09 +02:00
aspangaro
b384f91096 Merge branch 'upstream/develop' 2014-05-28 05:35:35 +02:00
aspangaro
dce9c2bc76 Fiscal year - 1st step 2014-05-28 05:34:10 +02:00
Laurent Destailleur
1557d8973f Fix: [ bug #1403 ] suppression d'une fiche produit impossible 2014-05-26 23:12:47 +02:00
Laurent Destailleur
51b6be4a64 Fix: If user has no perm to see other user, see himself. 2014-05-26 17:33:19 +02:00
Laurent Destailleur
7bd46d8aee Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-26 17:28:00 +02:00
Laurent Destailleur
1199d54fb2 Fix: When user has no permissions to see all other user, we must keep 
only user.
 2014-05-26 17:21:48 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
12fed4f4d7 Fix: CRLF 2014-05-26 12:32:33 +02:00
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
Laurent Destailleur
ae01c785c5 Fix: Do not show ref supplier title if ref_supplier not set (currently 
always the case with 3.5).
 2014-05-25 03:57:13 +02:00
BENKE Charles
3d7b6e9a26 Update commonobject.class.php 2014-05-24 19:51:05 +02:00
Laurent Destailleur
9bc1a6b4f5 Fix: favicon must use dol_buildpath and not hardcoded path 
Conflicts:
	htdocs/core/lib/security2.lib.php
 2014-05-24 18:29:22 +02:00
Laurent Destailleur
44ebaf45cf Fix: favicon must use dol_buildpath and not hardcoded path 2014-05-24 18:21:05 +02:00
Laurent Destailleur
872e764c94 Fix: html detection was not working with hx tags. 2014-05-24 14:57:41 +02:00
Laurent Destailleur
07bc933110 Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1405

Conflicts:
	ChangeLog
 2014-05-23 20:21:41 +02:00
Laurent Destailleur
2771c506e9 Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1407

Conflicts:
	ChangeLog
 2014-05-23 20:17:41 +02:00
Laurent Destailleur
dc94b6e1bf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:08:43 +02:00
Laurent Destailleur
20ec1e6ac8 Fix: Suppliers invoices must be visible if module supplier is on. 2014-05-23 19:55:40 +02:00
Laurent Destailleur
300e430024 Fix: If user already exists but permissions not set, it was not possible 
to install Dolibarr.
 2014-05-23 16:13:00 +02:00
Marcos García de La Fuente
fa733c8ba4 Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande 2014-05-23 11:42:14 +02:00
Laurent Destailleur
43bf9ba890 Fix: Import of ical files was broken 
Fix: Can import of ical files from BlueMind.
 2014-05-23 04:28:57 +02:00
Marcos García de La Fuente
9cc74c36d2 Missing copyright info 2014-05-23 02:45:15 +02:00
Marcos García de La Fuente
77c09d887a Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes 2014-05-23 02:44:02 +02:00
Florian HENRY
2a16a562d9 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-22 12:51:55 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
Laurent Destailleur
3f96632e02 Fix: CRLF 2014-05-21 20:34:52 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Laurent Destailleur
544bd27700 Merge pull request #1611 from guerinaxel/patch-3 
Correcting log use for commonobject.class.php
 2014-05-19 16:12:20 +02:00
Laurent Destailleur
ff46adf284 Merge pull request #1607 from GPCsolutions/3.6b-review 
3.6b review
 2014-05-19 16:07:49 +02:00
guerinaxel
1dbcd215b8 Correcting log use for commonobject.class.php 
Correcting dol_syslog use which had 3 parameters instead of 2.
 2014-05-19 15:54:43 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Raphaël Doursenaud
00162cc93d Members: fixed typo 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
c83a0309b1 Barcode: fixed wrong menu 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
13cb2e478f Contracts module configuration: missing translation string 2014-05-19 14:37:30 +02:00
BENKE Charles
86e0d377f8 Update objectline_view.tpl.php 2014-05-19 09:40:06 +02:00
BENKE Charles
c8067931e3 Update commonobject.class.php 2014-05-19 09:32:42 +02:00
BENKE Charles
b210d7a00f Update commonobject.class.php 
Hide the margintable if click at the top of it (usefull when customer are just in front of you), reappear when you click again
 2014-05-18 14:59:20 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
00dd7db75e Fix: Miscellaneous fixes into emailing target selectors (missing field 
name, missing translation, sql syntax error, missing fiels other)
 2014-05-17 19:43:22 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Laurent Destailleur
f7d1e93136 Move module to status development 2014-05-14 12:27:09 +02:00
Laurent Destailleur
15796ec592 Fix: checkstyle errors 2014-05-14 12:19:45 +02:00
Laurent Destailleur
0027dc30f5 Fix: Modules into core should never, by definition, activate hooks 
(hooks are architecture solution for external module)
 2014-05-14 12:14:18 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Laurent Destailleur
4a347236ee Merge pull request #1594 from atm-alexis/develop 
Add detailled view in supplier order as in customer order
 2014-05-14 11:40:49 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +02:00
Florian HENRY
1f1a9e46fd Fix warning 2014-05-13 19:12:14 +02:00
Florian HENRY
a421d9f60f Fix notice pgsql method 2014-05-13 18:54:57 +02:00
Florian HENRY
8274b49fc1 Avoid notice during PGSQL installation 
$unescapeslashquot
 2014-05-13 18:50:35 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no 
more by default (we keep data intact when no mode provided).
 2014-05-13 13:22:29 +02:00
Florian HENRY
b6f091926f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-13 11:40:39 +02:00
Florian HENRY
d2e2dabf26 Add showempty into combobox 2014-05-13 11:40:19 +02:00
Laurent Destailleur
f918ae7e4f Decrease log level for disabled trigger 2014-05-13 10:36:01 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
5fa05ee29d Start to clean code of templates to input lines 2014-05-12 12:53:10 +02:00
Alexis Algoud
197ff1a653 Add detailled view in supplier order as in customer order 2014-05-12 12:10:53 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Laurent Destailleur
5f0c4dbe48 Fix: TCPDF error file not found in member card generation 2014-05-12 10:07:57 +02:00
Laurent Destailleur
bb4eed0a1e Merge pull request #1591 from defrance69/patch-9 
Update commonobject.class.php
 2014-05-12 01:56:39 +02:00
Laurent Destailleur
6b1bdf9913 Merge pull request #1587 from aternatik/odt_thirdpartycontact 
Fix : bad call of extrafields into contact substitution
 2014-05-12 01:53:41 +02:00
BENKE Charles
8c8c641411 Update commonobject.class.php 
$objecttype == 'order_supplier' already tested on the previous else if
 2014-05-11 23:19:18 +02:00
Laurent Destailleur
8428caf8fb List cleaner 2014-05-11 21:59:35 +02:00
Laurent Destailleur
d4534f4a0b Fix: [ bug #1384 ] Wrong name for import products and product prices 2014-05-11 17:52:16 +02:00
Marcos García de La Fuente
7b05944530 Corrected strings not translated and typos in English language 2014-05-11 13:14:45 +02:00
jfefe
04161084cf Fix : missing method to delete linked resource 2014-05-11 12:26:57 +02:00
jfefe
45aa1b9136 Use hook for resource card 2014-05-11 12:11:58 +02:00
jfefe
12aafd219d Fix : update linked resource 2014-05-11 10:19:38 +02:00
jfefe
901c083ce6 Fix : bad link to list into resource menu 2014-05-11 00:26:54 +02:00
jfefe
225c7ae07b New : link resource with any element 
With tpl system, external modules can declare resource with hook getElementResources
 2014-05-10 22:07:54 +02:00
Jean-François Ferry
b3f7e9f99b Fix : bad usage of this 2014-05-10 22:07:54 +02:00
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
6a9bf009f2 Clean code 2014-05-10 22:07:13 +02:00
Jean-François Ferry
c5e02edfa8 Add submenu for adding resource 2014-05-10 22:06:23 +02:00
Jean-François Ferry
1caffcffaf Add new perm to link resource to an element 2014-05-10 22:06:23 +02:00
Jean-François Ferry
c04812cd15 Fix: bad lang file 2014-05-10 22:06:22 +02:00
Jean-François Ferry
fdb50ab116 Move generic function from commonobject.class to functions2.lib.php (work on resource module) 2014-05-10 22:06:22 +02:00
Jean-François Ferry
e76ce87547 Remove unused css 2014-05-10 22:03:05 +02:00
Jean-François Ferry
6e24004e82 Remove resource module config page 2014-05-10 22:03:05 +02:00
Jean-François Ferry
bb58bed930 In commonoobject add method for adding resource to an element 2014-05-10 22:03:05 +02:00
Jean-François Ferry
e63f8b87c1 Mark resource module as experimental / need Dolibarr 3.5 2014-05-10 22:03:05 +02:00
Jean-François Ferry
71c44d82ab Move resource module functions into commonobject : 
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
 2014-05-10 22:03:05 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Laurent Destailleur
3776f7b146 Fix: margin calculation from % when we enter a free product. 2014-05-10 20:10:59 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
7bb24969d8 Fix: [ bug #1372 ] Margin calculation does not work in proposals 2014-05-10 19:52:24 +02:00
Laurent Destailleur
12055aa44a I did a better fix to have no more dependencies between modules. 2014-05-10 19:04:33 +02:00
Laurent Destailleur
c20a5d7e18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 19:02:55 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
jfefe
31044f1f72 Fix : bad call of extrafields into contact substitution (works with socpeople) 2014-05-10 18:51:54 +02:00
Juanjo Menent
4e53b57313 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 17:54:13 +02:00
Laurent Destailleur
1724fd2f89 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-10 16:44:12 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Laurent Destailleur
f855709cf4 Merge pull request #1585 from FHenry/3.5 
"or" into if instead of ||
 2014-05-10 15:44:25 +02:00
Laurent Destailleur
a627dd9ae8 Fix: Duplicate line when project has no tasks. 2014-05-09 17:14:40 +02:00
Florian HENRY
2aa2f896c6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-09 13:28:45 +02:00
Florian HENRY
02e0fac79f "or" into if instead of || 2014-05-09 13:28:29 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
4bf86508a5 Merge pull request #1583 from FHenry/3.5 
Fix error return project deletion
 2014-05-07 19:25:02 +02:00
Laurent Destailleur
ef2a8a0b09 Merge pull request #1582 from marcosgdf/changelog 
Changelog
 2014-05-07 19:18:41 +02:00
Laurent Destailleur
16b3ec8923 Fix: concat of string must use dol_concat. 2014-05-07 19:06:47 +02:00
Laurent Destailleur
1bc3558307 Fix: Better html detection 2014-05-07 19:06:15 +02:00
Florian HENRY
0e2497e710 [ bug #1377 ] Warning: get_class() called without object from outside a 
class
 2014-05-07 18:19:46 +02:00
Florian HENRY
395e09d64d fix warning message into function2.lib.php 2014-05-07 17:25:50 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Laurent Destailleur
9add45aea3 Qual: Mutualize code. 2014-05-07 13:22:02 +02:00
Laurent Destailleur
845f764f93 Increase default size of image 2014-05-07 12:21:14 +02:00
Marcos García de La Fuente
8681079fa7 Fixed CR 2014-05-07 10:42:13 +02:00
Laurent Destailleur
182dd774b6 Fix: phpunit regression 2014-05-07 09:54:36 +02:00
Laurent Destailleur
95b5094e94 Fix: phpunit regression 2014-05-07 09:33:56 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	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/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79 Fix: [ bug #1360 ] note indicator for member tab. 2014-05-06 23:42:19 +02:00
Laurent Destailleur
3abede630b Fix: [ bug #1365 ] ODT template tag {company_note} does not get 
replaced.
 2014-05-06 23:36:01 +02:00
Laurent Destailleur
e214cdf231 Fix: [ bug #1365 ] ODT template tag {company_note} does not get 
replaced.
 2014-05-06 23:35:09 +02:00
Laurent Destailleur
99dc3598de Fix: [ bug #1364 ] Duplicate Id on permission 2014-05-06 23:27:44 +02:00
Laurent Destailleur
460b5296ba Fix: [ bug #1353 ] Email notifications, wrong URL 2014-05-06 22:21:34 +02:00
Laurent Destailleur
7a452519e7 Try to fix [ bug #1363 ] Unable to update from 3.5.1 to 3.5.2 2014-05-06 22:00:54 +02:00
Laurent Destailleur
01001592e6 Finished task to merge form of free product and predefined product. 2014-05-06 18:31:39 +02:00
Laurent Destailleur
647d431857 Fix: contact of delivery of order not visible into typhon pdf. 2014-05-06 13:43:41 +02:00
Laurent Destailleur
959b104b78 Fix: the pdf template name for typhon as not correctly set when enabling 
module.
 2014-05-06 13:31:30 +02:00
Laurent Destailleur
c4291c228e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-06 13:16:06 +02:00
Laurent Destailleur
948e0bf753 Fix: When on delivery receipt, ref of shipment was not visible. Also 
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.
 2014-05-06 13:15:37 +02:00
philippe
a04cd99090 fix : no room when number of pages sup than 9 2014-05-05 19:03:25 +02:00
Laurent Destailleur
dca53accaf Fix: translation 2014-05-05 18:30:07 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00
Laurent Destailleur
cc8dcacbc9 New: DolEditor can accepts percent instead of nb of cols for textarea 
mode.
 2014-05-05 13:41:25 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51 New: The combo list of juridical status is now sorted 2014-05-04 23:46:36 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
5b5a894aaf Merge pull request #1567 from marcosgdf/doc 
Improved documentation of Societe and started type hinting variables
 2014-05-04 18:07:08 +02:00
Laurent Destailleur
697f68c9a9 Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5 
Conflicts:
	ChangeLog
 2014-05-04 17:43:47 +02:00
Laurent Destailleur
5a9cca62a6 Clean code 2014-05-04 17:38:26 +02:00
Laurent Destailleur
03f9f0bada Fix: Pb of records not correctly cleaned when module marge is 
uninstalled (conflict between 'margin' and 'margins').
 2014-05-03 20:21:35 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
105d892d27 Corrected Translate::getLabelFromKey doc 2014-05-03 13:42:34 +02:00
Marcos García de La Fuente
abfb8b2317 Corrected Database.interface doc 2014-05-03 13:27:24 +02:00
Marcos García de La Fuente
0d129617cb Corrected Database.interface::fetch_object doc 2014-05-03 13:24:42 +02:00
Laurent Destailleur
e1d30837e9 Try to remove a warning 2014-05-03 03:10:58 +02:00
Laurent Destailleur
50c10d3d1e Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:20:26 +02:00
Laurent Destailleur
43253d877a Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:15:33 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Florian HENRY
2637305065 same 2014-05-01 18:15:32 +02:00
Florian HENRY
a4126fae66 [ bug #1341 ] Lastname not added by file or direct input in mass 
e-mailing
 2014-05-01 18:13:01 +02:00
Laurent Destailleur
7bb23086b8 Fix: Strict mode 2014-05-01 17:06:14 +02:00
Laurent Destailleur
6a53a4e0d2 Fix: doxygen 2014-05-01 16:43:40 +02:00
Laurent Destailleur
21716a0c7c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-01 16:27:16 +02:00
Laurent Destailleur
b56f59b313 Perf: Avoid to isntantiate object 'form' into 'subform' classes when 
already available.
Qual: Better information into xdebug page.
 2014-05-01 16:26:57 +02:00
Laurent Destailleur
ee6cac8294 Doc 2014-05-01 16:11:29 +02:00
Laurent Destailleur
0219d53f69 Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into aternatik-odt_thirdpartycontact 2014-05-01 11:22:32 +02:00
Laurent Destailleur
6a200105b9 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	ChangeLog
 2014-05-01 11:16:42 +02:00
Laurent Destailleur
3719fc1234 Merge pull request #1557 from defrance69/develop 
export extrafields on bill & set real ref bordereau number
 2014-05-01 11:09:16 +02:00
Laurent Destailleur
569d4cfd41 Merge pull request #1556 from FHenry/develop 
Enable option clone target emailing
 2014-05-01 11:08:05 +02:00
aspangaro
501b7209de Move module trips into family "hr" 2014-05-01 04:57:49 +02:00
jfefe
fd45bb16bd Fix : make ODT substitution for company after contacts 2014-04-30 19:18:51 +02:00
Laurent Destailleur
a574aeff96 Qual: Removed warning 2014-04-30 15:30:20 +02:00
Laurent Destailleur
b11bd00e9a Fix: Removed blank lines at beginning of email when contact not defined 2014-04-30 15:17:39 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
Jean-François Ferry
00cd616f4c Add informations about contacts of thirdparty into ODT 2014-04-30 10:36:23 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
BENKE Charles
468f6fd5fb Update modFournisseur.class.php 
Add extrafields export feature on bill
 2014-04-29 11:57:51 +02:00
BENKE Charles
b283ed73d1 Update modFacture.class.php 
add export extrafields feature
 2014-04-29 11:53:04 +02:00
Florian HENRY
7a46bdfc55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-04-28 17:20:40 +02:00
Florian HENRY
dddbc37d35 Enable option clone target emailing 2014-04-28 17:18:11 +02:00
Laurent Destailleur
4cb671f4db Qual: Clean deprecated code. 2014-04-28 11:55:08 +02:00
Laurent Destailleur
4a23a8a789 Merge branch 'category_translate' of github.com:aternatik/dolibarr into 
aternatik-category_translate

Conflicts:
	ChangeLog
 2014-04-28 02:39:56 +02:00
Laurent Destailleur
e5c5b15ecc Qual: Start to clean module ECM (Code is to complex). Prepare for 
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
 2014-04-28 01:46:11 +02:00
Laurent Destailleur
8c5bc11def Qual: Better error message for LDAP connection 2014-04-27 14:16:29 +02:00
Laurent Destailleur
8c7ff91341 Fix: Removed html5 warnings 2014-04-27 01:51:50 +02:00
Laurent Destailleur
8beaf30e88 Qual: Removed useless use of js 2014-04-27 01:51:31 +02:00
Laurent Destailleur
5f1e690039 New: Show invoice ref in boxes for supplier invoices. 2014-04-26 23:15:45 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
4fa472518e Fix: doxygen 2014-04-26 22:23:46 +02:00
Laurent Destailleur
bd8cdd337a Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template. 2014-04-26 22:17:11 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00
Laurent Destailleur
6968304641 Fix: [ bug #1352 ] Removing a shipping does not remove the delivery. 2014-04-26 17:27:59 +02:00
Laurent Destailleur
4ade14b841 Qual: Removed code we should not have. 2014-04-26 16:15:35 +02:00
Laurent Destailleur
71ca269c71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
 2014-04-25 20:29:29 +02:00
Laurent Destailleur
9a320cc50f Removed a function we should not have. 2014-04-25 20:18:26 +02:00
Laurent Destailleur
196cf53dbd Fix: Pb of return values 2014-04-25 20:11:38 +02:00
Laurent Destailleur
b117ea83be Fix: missing trans 
Fix: detection of html content
 2014-04-25 16:45:14 +02:00
jfefe
d256799abf Work on adding catgory translation 2014-04-25 15:17:12 +02:00
jfefe
afaf5698a5 Fix : bad link to categorie admin page 2014-04-25 14:25:49 +02:00
Laurent Destailleur
889ed4a49c Fix: div was opened and not close or the oposite. 2014-04-24 01:26:28 +02:00
Laurent Destailleur
03d73bce9c Merge pull request #1550 from GPCsolutions/staticanalysis 
Various fixes to defects found using statical analysis tooling
 2014-04-23 21:20:39 +02:00
Laurent Destailleur
6c56302fd2 Merge pull request #1547 from GPCsolutions/jsinjection 
Qual: Prevent potential JS injection
 2014-04-23 21:14:22 +02:00
Laurent Destailleur
5e2c360d38 Merge pull request #1546 from GPCsolutions/linkfix 
Fix undeclared variable
 2014-04-23 21:13:06 +02:00
Laurent Destailleur
8d6e80d016 Merge pull request #1545 from GPCsolutions/dolidb 
Dolidb
 2014-04-23 21:12:43 +02:00
Laurent Destailleur
82d57c20cc Merge pull request #1542 from FHenry/develop 
add filter to effectif select
 2014-04-23 21:10:07 +02:00
Raphaël Doursenaud
11ef3ef34e Qual: Missing variable declaration 2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
a57b7d4ed2 Qual: Derived missing variable from a known one 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
7852020b3d Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
490b45ea7e Qual: Wrong type in method documentation 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
e3fa0332f4 Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
167457562e Qual: Wrong variable name 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
8f215205fa Qual: Wrong type in method documentation 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
79e2bf4737 Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
c4569b10d0 Qual: Wrong variable name 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
10a0994241 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
370996d5c4 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
32f5ecfaa3 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
6366a66efd Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
9bb454b242 Qual: Wrong variable name 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
953e196a2c Qual: Missing variable declaration 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
f357d3c5ab Qual: Missing global declaration 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
aa1ff28158 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
22263dc2c1 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e738a294e8 Qual: Wrong variable name 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
1d52f6d6c2 Qual: Fixed typo 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e561cc87f7 Qual: Wrong variable name 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2abbc8845f Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
0d92abc037 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2cfe27b434 Qual: Wrong type in method documentation 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
6174099827 Qual: Wrong type in method documentation 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
858d1dc8d0 Qual: Missing variable declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
db82a6f0e6 Qual: Missing global declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
988e7a137e Qual: Missing global declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
f476bee0c7 Qual: Missing variable declaration 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
20983b4807 Qual: Removed unused variable 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
7497a72b1d Qual: Removed dead code 2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
4f3a28e7ed Qual: Removed unused variable 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
5d74a5a852 Qual: Wrong variable name 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
70606d04ea Qual: Missing global declaration 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
e7d9423812 Qual: Wrong variable name 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
126d2522fd Qual: Missing global declaration 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
aacd657972 Qual: Wrong variable name 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
96e12e75bb Qual: Missing variable declaration 2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
9c5db27a70 Qual: Wrong type in method documentation 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
592b738f96 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
71cd774d04 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
9960e5aa8f Qual: Removed unused variable 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
1757c9d45e Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0a08f3c6e3 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
12ba751432 Qual: Missing global declaration 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0cb58e0b52 Qual: Wrong variable name 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
8b5b7203d5 Qual: Missing global declaration 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
32ced9a502 Qual: Removed missing variable 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
3a7773081e Qual: Missing method arguments 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
11125f98be Qual: Missing global declaration 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
d1f59b73d7 Qual: Wrong variable name 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
b3630cc588 Qual: Missing variable declaration 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
2970ead6f3 Qual: Wrong type in method documentation 2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
119e96a8b1 Qual: Missing global declaration 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
f4f4eca841 Qual: Wrong variable name 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
9e839f43e6 Qual: Wrong type in method documentation 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
6788c5b7f8 Qual: Wrong type in method documentation 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
fe05d3f2c4 Qual: Missing global declaration 2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
96c0c43404 Qual: Missing global declaration 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
d717133d62 Qual: Removed dead code 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
b68fb41d28 Qual: Wrong type in method documentation 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
1c3c20105e Qual: Wrong type in method documentation 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
d66ba0e026 Qual: Wrong type in method documentation 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
f1f550e551 Qual: Removed missing variable from function call 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
ca8cf9101c Qual: Removed missing variable from function call 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
7a6b3a0827 Qual: Missing variable declaration 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
036cc7472f Qual: Removed missing variable from function call 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
1c7011523d Qual: Missing global declaration 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
6fc9fbd7a6 Qual: Derived missing variable from a known one 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
202344e8fb Qual: Wrong type in method documentation 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
234a2a0e27 Qual: Removed call to inexistant object 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
82973eb0b7 Qual: Removed missing variable from function call 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
eca27d6711 Qual: Wrong type in method documentation 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
85d1770646 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
652cb77e40 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
229bc890d4 Qual: Moved variable declaration for later usage 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
3830329499 Qual: Removed missing variable 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
996704d258 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
75eb98033f Qual: Fixed typo 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
aad4359786 Qual: Removed missing variable from function call 2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
e5975d52a9 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
43606c8ac4 Qual: Fixed typo 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
b6312d1efd Qual: Missing method argument 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
af7d2d0b50 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
63166f3f5c Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
aa5d0b37b7 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
1bb99da8db Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
0fa803977e Qual: Removed call to inexistant object 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
749973f1b6 Qual: Missing variable declaration 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
32ad4461b8 Qual: Missing method argument 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
0ca5a46345 Qual: Bad copy/paste 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
7039fd3892 Qual: Missing class property declaration 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
0be3d3bd2f Qual: Missing global declaration 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
9d7fc43951 Qual: Wrong type in method documentation 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
cd774c0dcd Qual: Missing global declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
e3385119a4 Qual: Missing argument 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
70cf592270 Qual: Wrong type in method documentation 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
2938ec06b2 Qual: Fixed typo 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
70c9dda964 Qual: Missing global declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
a22ead5e97 Qual: Wrong type in method documentation 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
b522d51d49 Qual: Missing global declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
258c92ab1c Qual: Avoid wrong declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
3eabffbc7c Qual: Missing global declaration 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
d57b4192b6 Qual: Wrong variable name 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
670e861d7b Qual: Missing global declaration 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
db91684193 Qual: Wrong type in method documentation 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
6cfcdbfe56 Qual: Wrong type in method documentation 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
84c9a390eb Qual: Mistyped class property 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
7cf553a636 Qual: Missing variable declaration 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
c8b1c3b57d Qual: Wrong type in method documentation 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
284057d447 Qual: Wrong variable name 2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
4bf426c816 Qual: Undeclared variable replacement 2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
39c064cb74 Qual: Removed useless assignment from void method 2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
83dd3a532b Qual: Better type check 2014-04-23 18:23:50 +02:00
Raphaël Doursenaud
79fe0a1658 Qual: Prevent potential JS injection 2014-04-23 15:20:45 +02:00
Laurent Destailleur
c1e349d110 Experiment hidden option MAIN_MENU_INVERT 2014-04-23 12:22:01 +02:00
Raphaël Doursenaud
98120862f7 Qual: Moved duplicate method to base method 2014-04-23 12:15:18 +02:00
Raphaël Doursenaud
e62edc0a72 Fix undeclared variable 2014-04-23 11:19:34 +02:00
Raphaël Doursenaud
16ede7c52c Qual: Moved duplicate methods to base method 2014-04-23 11:12:06 +02:00
Raphaël Doursenaud
5cbb1dd96d Qual: Removed useless method 
The method is already in the DoliDB base class
 2014-04-23 11:07:00 +02:00
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
Florian HENRY
ff597a899f add filter to effectif select 2014-04-22 11:20:19 +02:00
BENKE Charles
0b78a04756 Update doc_generic_project_odt.modules.php 2014-04-19 12:32:01 +02:00
Laurent Destailleur
bb2c829997 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
 2014-04-18 12:34:32 +02:00
Laurent Destailleur
ee3592c976 Fix: invert label for accountancy_code_sell 2014-04-18 11:21:15 +02:00
Laurent Destailleur
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Laurent Destailleur
38a0596594 Merge branch 'develop' of https://github.com/aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/core/lib/bank.lib.php
 2014-04-13 02:11:54 +02:00
Laurent Destailleur
5d30220bf1 Merge pull request #1530 from squarou/develop 
Add region tab for stats in adhrent
 2014-04-13 02:04:02 +02:00
Laurent Destailleur
31fa6c5b2b Merge branch 'develop' of https://github.com/guerrierk/dolibarr into 
guerrierk-develop

Conflicts:
	htdocs/commande/fiche.php
 2014-04-13 01:59:46 +02:00
aspangaro
79d8ce9d1d Add tabs in bank card 2014-04-12 10:00:28 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
918de2d0a1 Fix: Payment detail are not visible. 2014-04-11 19:20:11 +02:00
Laurent Destailleur
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02:00
squarou
a0b05581f9 Added region tab 2014-04-10 22:15:56 +02:00
Laurent Destailleur
7fcf57ca5a Fix: SQL request for export. Extra field missing. 2014-04-10 18:36:34 +02:00
Laurent Destailleur
4be113b2e8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-10 17:55:14 +02:00
Laurent Destailleur
30731e6c91 Fix: Must use $this 2014-04-10 17:51:42 +02:00
GUERRIER Kevin
3d725f37cb Adding Bank head completion from other modules 2014-04-10 15:23:58 +02:00
Laurent Destailleur
5d4b861156 Fix: Try/catch 
Conflicts:
	htdocs/core/class/conf.class.php
 2014-04-09 17:09:38 +02:00
Laurent Destailleur
b586b74c79 Fix: Try/catch 2014-04-09 17:07:27 +02:00
Laurent Destailleur
13929bc46f New: showrefnav can be used with tables without prefix. 2014-04-09 13:19:31 +02:00
Laurent Destailleur
6f40825270 Merge pull request #1527 from grandoc/3.5 
translation and cleaning
 2014-04-09 00:31:57 +02:00
Laurent Destailleur
60b37dffe1 Fix: [ bug #1323 ] generation of odt files for tasks. 2014-04-09 00:07:32 +02:00
Laurent Destailleur
30dae3def2 Doc 2014-04-08 23:28:26 +02:00
Grand Philippe
f25ddfbc9c Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2014-04-07 10:03:01 +02:00
Grand Philippe
42b6628b76 translation and cleaning 2014-04-07 09:54:24 +02:00
Laurent Destailleur
3bc63c43dc Fix: [ bug #1322 ] notification d'erreur en insérant ou supprimer un 
tiers dans une catégorie
 2014-04-06 21:25:26 +02:00
Laurent Destailleur
41a2ce1a74 Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 
Conflicts:
	htdocs/comm/propal.php
 2014-04-06 21:21:08 +02:00
Laurent Destailleur
1c21c00fb6 New: Can use "Space" as value for SeparatorThousand into language files 2014-04-06 21:18:21 +02:00
Laurent Destailleur
a2531872cb Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 2014-04-06 21:17:35 +02:00
Laurent Destailleur
d595b96c8e New: Paypal return for subscription show more information and direct 
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
 2014-04-06 14:22:08 +02:00
Laurent Destailleur
688ce704ec Fix: Doxygen 2014-04-05 15:14:19 +02:00
Laurent Destailleur
d2b1b1a86c Merge branch 'actiontriggers' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang
 2014-04-04 23:47:36 +02:00
Laurent Destailleur
262efb997f Fix: paddingrightonly must use $right and $left to be compatible with 
LTR languages.
 2014-04-02 18:45:59 +02:00
Laurent Destailleur
d5448f9ca4 Merge pull request #1521 from FHenry/3.5 
Extrafield select form table do not display selected value on edit mode
 2014-04-02 14:57:00 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
cf8ff97855 Fix: Install of odt templates for project and tasks failed. 2014-04-02 13:17:20 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
 2014-04-02 11:41:55 +02:00
Florian Henry
a2a46f9300 Extrafield select form table do not display selected value on edit mode 2014-04-02 11:34:15 +02:00
Laurent Destailleur
46e46507ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/compta/bank/class/account.class.php
	htdocs/compta/bank/index.php
 2014-04-02 11:33:47 +02:00
Laurent Destailleur
6dab09e07a Fix: Bad dialog position 2014-04-02 00:04:13 +02:00
Laurent Destailleur
d2cb5e8d2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-31 22:56:47 +02:00
Laurent Destailleur
56c7d14b9a We do not force disabling of ckeditor for phones. We let ckeditor 
decide (currently ckeditor is disabled with android).
 2014-03-31 13:25:40 +02:00
Laurent Destailleur
c81406c7f3 Fix: CI 2014-03-31 02:41:15 +02:00
Laurent Destailleur
1fad693867 Fix: Removed useless strtolower 2014-03-31 02:25:35 +02:00
Laurent Destailleur
76259a633c Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have 
to do it everywhere at different places. Value is now 0 or 1.
 2014-03-31 02:16:49 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
61f649e1ae Fix: When select_date is called with '' as preselected date, 
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
 2014-03-29 04:26:44 +01:00
Laurent Destailleur
4815825501 Merge pull request #1511 from defrance69/patch-2 
Update box_ficheinter.php
 2014-03-27 16:01:57 +01:00
Laurent Destailleur
c2b7e40aa1 Merge pull request #1507 from GPCsolutions/3.5-taskswithtime 
Project: make tasks accept a time
 2014-03-27 15:56:26 +01:00
Raphaël Doursenaud
8d6084db39 Automatic agenda triggers: uncomment useful syslog 
The syslog was commented but is useful to spot unimplemented handlers that were nonetheless
enabled in the administration interface.
Also made it issue a warning level message.
 2014-03-27 12:02:16 +01:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
Laurent Destailleur
9e771269c4 Qual: clean code 2014-03-26 20:46:17 +01:00
Laurent Destailleur
62a990d6cc Fix: ajax_combobox function must be included before called. 
New: Feature of module survey are now localized into top menu "Tools".
 2014-03-26 16:02:22 +01:00
BENKE Charles
a3a6b6dff6 Update box_ficheinter.php 
External user show only is own intervention
 2014-03-26 10:57:07 +01:00
Raphaël Doursenaud
d9cb1da4d5 Project: make tasks accept a time 2014-03-24 15:26:36 +01:00
Laurent Destailleur
f115501ddf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-24 00:16:47 +01:00
Laurent Destailleur
3f78fe8c93 Fix: Avoid to get duplicate field 2014-03-23 21:01:05 +01:00
Laurent Destailleur
6039c81845 Fix: copy to clipboard does not work with jmobile 
Fix: Bad translation
 2014-03-23 20:56:41 +01:00
Laurent Destailleur
466de67b5b Fix: Solve pb of too many embedded tables 2014-03-23 20:18:07 +01:00
Marcos García de La Fuente
09e02f807f Even better improvement 2014-03-22 19:01:19 +01:00
Marcos García de La Fuente
e2f51d0df2 Removed duplicate line 2014-03-22 19:00:37 +01:00
Marcos García de La Fuente
c8c77dbdcf Fix: Agenda and Banks module were not working with multicompany module 2014-03-22 18:59:48 +01:00
Laurent Destailleur
a1e778c146 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-21 21:12:02 +01:00
Laurent Destailleur
1061a650d2 Fix: duplicate info 2014-03-21 21:11:51 +01:00
Laurent Destailleur
4bd6f11112 Backport fix to solve warning problems. 2014-03-21 18:35:50 +01:00
Laurent Destailleur
ed7ffebea4 Code comment 2014-03-21 18:32:18 +01:00
Laurent Destailleur
24dbfbba60 Qual: Still working on cleaning code for timezone management. 2014-03-21 18:05:08 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases. 
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
 2014-03-21 16:22:41 +01:00
Laurent Destailleur
b2f6498236 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-21 15:03:37 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Laurent Destailleur
a884673637 Fix: A better to fix to manage automatic creation of code for import. 2014-03-21 13:29:13 +01:00
Laurent Destailleur
c1411e65b7 Fix: Try to add code to provide easy way to fix warning on timezone not 
defined.
 2014-03-21 10:13:29 +01:00
Laurent Destailleur
aabd923248 Try to remove warning 2014-03-21 09:49:10 +01:00
Laurent Destailleur
4bf822225e Look: info admin picto now use the info picto (the star were confused 
with the mandatory "star").
 2014-03-19 23:50:10 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	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.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
d3e951e1ec Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-19 20:22:04 +01:00
Laurent Destailleur
2cced0bf43 Perf: Avoid makign a "desc table" for each row we import (for this we 
are using a global cache array).
 2014-03-19 20:02:39 +01:00
Laurent Destailleur
062c150bc1 Fix: import of fields with value "auto" 2014-03-19 19:33:43 +01:00
Laurent Destailleur
212deb9e1c Fix: fails to import when value is 'AUTO' because compare was case 
sensitive.
 2014-03-19 17:15:18 +01:00
Laurent Destailleur
2f10198064 Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was 
making a pagebreak higher than 2 pages.
 2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe Fix PDF: Page break was ko when breaking 2 pages or more. 
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
 2014-03-19 13:32:54 +01:00
Laurent Destailleur
ce4c78972a Fix: Image always fit into window when using cropping feature even if 
file is a very large file.
 2014-03-18 23:24:00 +01:00
Laurent Destailleur
80088c87ac Fix: Some debugs of module categories 2014-03-18 00:20:39 +01:00
Laurent Destailleur
7eea96c07c Minor fix into standing order. 2014-03-17 20:43:01 +01:00
Juanjo Menent
19a3088055 Fix: Add actions events not implemented 2014-03-17 17:05:55 +01:00
Laurent Destailleur
8cf3d258f4 Fix: Bug into calculation of total of time for tasks 2014-03-17 15:13:24 +01:00
Laurent Destailleur
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +01:00
Laurent Destailleur
14d8bfef3a New: Improved Opensurvey module: Description of survey use wysiwig 
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
 2014-03-17 12:40:12 +01:00
Laurent Destailleur
81b8961dab Qual: Dead code war 2014-03-17 11:13:53 +01:00
Laurent Destailleur
7974ae96ad Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr 
into aternatik-cat_extrafields

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-03-16 21:38:29 +01:00
Laurent Destailleur
b1498c584d Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into 
KreizIT-dluo_step5

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-16 20:49:56 +01:00
Laurent Destailleur
58add21719 Merge pull request #1488 from atm-maxime/mko1300 
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
 2014-03-16 20:26:57 +01:00
Laurent Destailleur
599142566e Merge pull request #1492 from aspangaro/develop 
Fix :: Failed to apply auguria_menu
 2014-03-16 20:25:13 +01:00
aspangaro
5175dcf135 Update also eldy menu 2014-03-16 20:17:25 +01:00
Laurent Destailleur
ed4f7fd083 Fix: error 2014-03-16 20:05:07 +01:00
Laurent Destailleur
2d3c700a7d Fix: When cloning product, autogenerating barcode must not use same 
number.
Qual: Moved dedicated permission of module to "advance" permissions.
 2014-03-16 17:37:54 +01:00
aspangaro
b09d7065c9 Fix :: Failed to apply auguria_menu since integration of salary payment in tax module 2014-03-16 17:30:58 +01:00
Jean-François Ferry
55750e16d8 Prepare extrafields into categories 2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
4d48034ad1 Fix 2014-03-16 09:50:03 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
104f2873da Qual: Remove code to fix dynamically bad code. 2014-03-15 22:30:40 +01:00
Maxime Kohlhaas
685c00cd27 Fix : Delivery date was displayed twice 2014-03-15 17:55:57 +01:00
Florian Henry
7625629491 Fix [ bug #1294 ] Expedition model Merou having problems with long names 2014-03-15 16:40:29 +01:00
Florian Henry
18c4d890dd Fix [ bug #1283 ] ROUGET Shipment PDF 2014-03-15 16:32:46 +01:00
KreizIT
3782742aad - add batch management on supplier dispatch product 
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
 2014-03-15 10:28:01 +01:00
Raphaël Doursenaud
a23f6d6a85 Database: factorized lastqueryerror() 2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
7df97b7cfb Database: factorized lasterror() 2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
f894df1d9e Database: factorized lastquerry() 2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
e4e78bdd3e Database: factorized getLabel() 2014-03-15 08:41:43 +01:00
Raphaël Doursenaud
3f6b175879 Database: factorized getVersionArray() 2014-03-15 06:40:13 +01:00
Raphaël Doursenaud
73d957f158 Database: factorized common properties 2014-03-15 06:38:52 +01:00
Raphaël Doursenaud
f91e2ec7b2 Database: factorized begin() 2014-03-15 06:17:12 +01:00
Raphaël Doursenaud
739a566156 Database: factorized lasterrno() 2014-03-15 06:07:46 +01:00
Raphaël Doursenaud
0ab6fcaaca Database: factorized idate() 2014-03-15 06:04:16 +01:00
Raphaël Doursenaud
64fbefdb7c Database: factorized ifsql() 2014-03-15 05:55:02 +01:00
Raphaël Doursenaud
eb86abff94 Database: factorized jdate() 2014-03-15 05:54:51 +01:00
Florian Henry
3f6b319d41 Fix deposit invoice 2014-03-14 23:42:45 +01:00
Maxime Kohlhaas
3131b92988 Fix bug 1293 : numbering failed 2014-03-14 23:18:46 +01:00
philippe grand
f9c48be2a9 fix : display specimen 2014-03-14 18:23:37 +01:00
Laurent Destailleur
32364ac18b Move skype module from experimental to stable. 2014-03-14 15:26:26 +01:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +01:00
Laurent Destailleur
561a1a1aac Fix: Miscellaneous problems on task tabs (withproject parameter lost and 
download fails).
 2014-03-14 02:07:54 +01:00
Laurent Destailleur
f1b05dd3c2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-13 12:37:39 +01:00
Laurent Destailleur
6cec011df6 New: Add manager name (ceo, director, president...) into main company 
information page.
 2014-03-13 12:22:53 +01:00
Laurent Destailleur
743b0f1834 Merge pull request #1458 from KreizIT/dluo_step4 
Dluo step4
 2014-03-13 11:57:06 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
ded5d47afc Fix: multilangs array was not loaded. 2014-03-12 01:21:18 +01:00
Laurent Destailleur
241ae7a4d1 Fix: Miscellaneous bugs on tasks management 
Conflicts:
	htdocs/core/lib/project.lib.php
 2014-03-11 20:53:47 +01:00
Laurent Destailleur
2740886711 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-11 20:38:57 +01:00
Laurent Destailleur
afca98323b Fix: Miscellaneous bugs on tasks management 2014-03-11 20:38:29 +01:00
Laurent Destailleur
5ee17a2f14 Merge pull request #1460 from atm-gauthier/3.5 
error on ajax_constantonoff function
 2014-03-11 11:53:44 +01:00
aspangaro
d97f9e50cd Merge branch 'upstream/develop' 2014-03-11 10:40:22 +01:00
Laurent Destailleur
c9edced656 - New: Add filter on project status into task list. By default, only 
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
 2014-03-11 09:43:26 +01:00
Marcos García de La Fuente
20262a0164 Fix bug #1295: Error when creating an agenda extrafield with a number as reference 2014-03-10 23:58:16 +01:00
Gauthier
92e8f54e9a error on ajax_constantonoff function 2014-03-10 10:53:20 +01:00
Laurent Destailleur
2a853329e5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
 2014-03-08 14:25:59 +01:00
Laurent Destailleur
c082d7c82e Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/main.inc.php
 2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
 2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f Fix: Compatibility with v4 of ckeditor (for debian) 2014-03-08 14:06:01 +01:00
Laurent Destailleur
2c0f1340d5 New: Update ckeditor to version 4 (part 2) 2014-03-08 13:17:20 +01:00
aspangaro
db0a45d78f Merge branch 'upstream/develop' 2014-03-08 04:54:24 +01:00
Laurent Destailleur
0a2a635755 Fix: td balance. 
Fix: New price was not used when editing a line when margin module was
on.
 2014-03-07 11:58:30 +01:00
KreizIT
a0f1a60780 Change on shipment for batch product 2014-03-07 11:35:16 +01:00
Laurent Destailleur
32c81588b0 Fix: doxygen 2014-03-07 10:54:57 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
15aebfb7a3 Merge pull request #1455 from marcosgdf/bug-loadban 
Corrected bug when creating document from ODT template
 2014-03-06 18:38:56 +01:00
Laurent Destailleur
260dfe3844 Merge pull request #1454 from marcosgdf/locale-line-odt-tags 
Locale line ODT tags
 2014-03-06 18:34:33 +01:00
Laurent Destailleur
cd3e56a2d0 Merge pull request #1450 from grandoc/develop 
fix english misspelling
 2014-03-06 18:23:51 +01:00
Marcos García de La Fuente
ca0eb7919e Corrected call to non-existing function 2014-03-06 09:02:36 +01:00
Marcos García de La Fuente
4433f6e8b7 Missing copyright info 2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3 Corrected array indentation 2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags 2014-03-06 08:55:37 +01:00
Laurent Destailleur
fa098adc78 Fix: infinite loop in function num_public_holiday 2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Laurent Destailleur
6f60755426 New: Add option MAIN_FAVICON_URL 2014-03-05 17:26:59 +01:00
Laurent Destailleur
16a074a69b Use better module id number 2014-03-05 12:25:31 +01:00
Grand Philippe
e32d31f76d fix english misspelling 2014-03-05 09:58:52 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
cdd2815d45 Merge pull request #1449 from KreizIT/dluo_step2 
Dluo step2
 2014-03-05 00:08:58 +01:00
Laurent Destailleur
c5e639041e More doc comment 2014-03-04 23:56:35 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +01:00
Laurent Destailleur
fd9d0747c8 Fix: Bad description 2014-03-02 16:44:31 +01:00
Laurent Destailleur
998ecc3c15 Optimize code. 2014-03-01 15:59:09 +01:00
Laurent Destailleur
206181a542 Merge pull request #1441 from syrus34/patch-3 
Update commondocgenerator.class.php
 2014-03-01 13:40:14 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-28 21:43:29 +01:00
Laurent Destailleur
68a508a0d1 Fix: sql error on numbering module for tasks 2014-02-28 21:40:08 +01:00
syrus34
dbdb8de79d Update commondocgenerator.class.php 
With version 3.5, a company can have several bank account
 2014-02-28 07:06:38 +01:00
BENKE Charles
303c459777 Update modProjet.class.php 
bad incrementation
 2014-02-27 11:29:08 +01:00
Laurent Destailleur
193a551b0a Merge pull request #1421 from defrance69/patch-30 
Update modProjet.class.php
 2014-02-27 11:19:28 +01:00
Laurent Destailleur
8f0e96fd02 Merge pull request #1440 from grandoc/develop 
anglicized
 2014-02-27 11:17:30 +01:00
Laurent Destailleur
827f7e898a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-27 10:50:27 +01:00
Laurent Destailleur
06b1c8b64a Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
 2014-02-27 10:47:15 +01:00
Laurent Destailleur
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
philippe
5c4ceb1a53 anglicized 2014-02-27 10:06:11 +01:00
philippe
1223e6a08b anglicized 2014-02-27 09:54:31 +01:00
Laurent Destailleur
4be679a7b2 Second try for Fix: The delivery date was missing. 2014-02-26 17:25:32 +01:00
Laurent Destailleur
0c2ca119d7 Fix: Add a test to avoid the non stable and experimental fuc... 
feature "MAIN_MENU_USE_JQUERY_LAYOUT" to make application hang.
 2014-02-26 16:51:38 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
9505f9e47c Fix: The delivery date was missing. 2014-02-26 15:41:56 +01:00
Laurent Destailleur
855dac45ea Fix: select_comptes was always making a filter on field clos making 
other filter field not working in some case.
 2014-02-26 15:29:40 +01:00
Laurent Destailleur
a822bc0736 Fix: The delivery date was missing. 2014-02-25 19:22:00 +01:00
Laurent Destailleur
abff284ab1 Fix: The delivery date was missing. 2014-02-25 19:07:42 +01:00
Laurent Destailleur
1790f905c9 Removed some code specific to databases and use instead correct abstract 
method of drivers.
 2014-02-25 18:25:17 +01:00
Laurent Destailleur
3f05651b94 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-25 16:14:51 +01:00
Laurent Destailleur
63a2aa3365 Fix: sql error with postgres when creating extrafield with an upper cas 
character. code for new fields must be always lowercase.
 2014-02-25 15:48:13 +01:00
Laurent Destailleur
7241714551 Merge pull request #1435 from marcosgdf/export-translations 
Corrected export translations
 2014-02-25 14:11:40 +01:00
Marcos García de La Fuente
e963f55593 Corrected CS error 2014-02-25 13:34:33 +01:00
Marcos García de La Fuente
f7eb4c5b14 Updated user export labels 2014-02-25 04:39:41 +01:00
Marcos García de La Fuente
4fe8e00601 Removed deprecated code 2014-02-25 04:29:34 +01:00
Marcos García de La Fuente
d69939b7b1 Function dol_clone is now a deprecated function 2014-02-25 04:29:09 +01:00
Marcos García de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Laurent Destailleur
f537f62aea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/impayees.php
 2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743 New: Sending remind of unpayed invoices by emails (need tester) 2014-02-24 16:50:36 +01:00
Laurent Destailleur
28739414f2 Merge pull request #1430 from FHenry/develop 
Price management enhancement (multiprice level, price by …  customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
 2014-02-24 10:14:48 +01:00
Laurent Destailleur
a797a5e665 Clean comment and make some implementations 2014-02-24 09:52:48 +01:00
Laurent Destailleur
404d24a029 Merge pull request #1426 from GPCsolutions/dbinterface 
Common Database interface
 2014-02-24 09:24:35 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Raphaël Doursenaud
0a74467296 Added FIXMEs and TODOs on all dummy methods in database drivers 2014-02-21 14:57:19 +01:00
Raphaël Doursenaud
501ffb12b3 Added dummy methods according to interface for Microsoft SQL and PostgreSQL 
Please implement if you have the required knowledge
 2014-02-21 14:52:21 +01:00
Raphaël Doursenaud
283fec164e Implemented rollback according to interface for Microsoft SQL and PostgreSQL 2014-02-21 14:40:10 +01:00
Raphaël Doursenaud
894ac6fdc0 Added missing method to mysqli class 2014-02-21 14:27:29 +01:00
Raphaël Doursenaud
ea14ca10cd Extracted mysql interface 2014-02-21 14:23:32 +01:00
simnandez
92a8fde88b New: Automatic events for sending mails showing info about mail linked 
objects.
 2014-02-21 12:53:06 +01:00
Laurent Destailleur
e5136487bd Fix: The customer code was set to uppercase when using numbering module 
leopard. We must keep data safe of any change.
 2014-02-20 16:51:37 +01:00
Laurent Destailleur
9da84e4dd8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-20 00:37:20 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
simnandez
c2db656c86 Fix: Action event SHIPPING_VALIDATE is not implemented 2014-02-19 17:33:22 +01:00
simnandez
7511f626b3 Fix: Action event SHIPPING_VALIDATE is not implemented 2014-02-19 17:32:20 +01:00
Laurent Destailleur
5a29b3d546 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/societe/soc.php
 2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916 Fix: Bad space in predefined messages. 
Fix: Signature was not added for email sent from thirdparty page.
 2014-02-19 15:33:04 +01:00
Laurent Destailleur
8c9d2418d2 Qual: Move common javascript function into lib_head.js 2014-02-19 11:08:43 +01:00
Laurent Destailleur
96e7985266 Fix: Translation of menu entries must not be into admin lang file (We 
don't want to load this file for common pages).
 2014-02-19 02:27:13 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
03d056319c Qual: Clean code for adding menu entries into Modules system admin 
entry.
New: Add entry for admin page Mass barcode init.
 2014-02-18 20:49:22 +01:00
Laurent Destailleur
5780f14a65 Qual: Removed TODO and add test to report bug. 2014-02-17 18:27:45 +01:00
Laurent Destailleur
867c83680b Merge remote-tracking branch 'origin/3.5' into develop 2014-02-17 18:22:49 +01:00
Laurent Destailleur
342ee2e6f6 Qual: Add a TODO to warn to remove this bug. 2014-02-17 18:22:15 +01:00
Laurent Destailleur
1cfcda702e Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not 
work.
 2014-02-17 17:32:25 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
e1efd88155 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-02-17 15:22:02 +01:00
Laurent Destailleur
8839ae38d3 Fix: [ bug #1241 ] error in request in select_paper file 
/core/class/html.formadmin.class.php
 2014-02-17 15:21:19 +01:00
BENKE Charles
8ac8af0f40 Update modProjet.class.php 
bad incrementation
 2014-02-17 12:12:18 +01:00
Laurent Destailleur
de64ce5b2a Fix: user right on Holiday for month report nor working 2014-02-17 00:09:48 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This 
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
 2014-02-16 23:51:29 +01:00
Laurent Destailleur
935b30470d Fix: Missing nowrap 2014-02-16 20:09:25 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
85e93872b3 Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:42:43 +01:00
Laurent Destailleur
3aba53a9ae Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:26:41 +01:00
Laurent Destailleur
4b8d39af9d Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.

Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-14 13:05:04 +01:00
Laurent Destailleur
1a3bace4e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-14 12:59:26 +01:00
Laurent Destailleur
3e3c541e4c Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.
 2014-02-14 12:54:04 +01:00
Laurent Destailleur
57153e4de4 Try a cleaner javascript escape function. 2014-02-13 23:40:39 +01:00
Laurent Destailleur
d6ba18cc20 Merge pull request #1416 from syrus34/patch-2 
Add fields company_iban and company_bic
 2014-02-13 17:53:08 +01:00
philippe
6f129c3800 display adherent module for external user 2014-02-13 16:36:34 +01:00
Laurent Destailleur
ead7df3306 Add backslash 2014-02-13 10:54:03 +01:00
syrus34
79d85d5888 Add fields company_iban and company_bic 2014-02-12 18:58:12 +01:00
Laurent Destailleur
634c5b64f1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/product/fiche.php
 2014-02-12 00:25:08 +01:00
Laurent Destailleur
266b413139 Fix: colspan for extrafields 2014-02-12 00:23:15 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03 New: Generation auto of barcode is available for product. 2014-02-10 00:24:20 +01:00
Laurent Destailleur
94be4ec897 Fix: Avoid error in migration from 3.1 version. 
Fix: Suggested migration choice was ko from x.y.z to x.y.z+1
 2014-02-08 14:55:27 +01:00
Laurent Destailleur
b94f7a6a6d Fix some amount were missing local version. 2014-02-08 03:51:30 +01:00
Laurent Destailleur
aad7885bca Fix: [bug #1226 ] page ne se charge pas quand beaucoup de prospect en 
base
 2014-02-08 02:35:59 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Laurent Destailleur
b714347b6b Fix: Substition of extra field was ko for order. 2014-02-08 01:01:31 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00
Laurent Destailleur
80046a5310 Qual: Mutualize code 2014-02-06 20:40:01 +01:00
Laurent Destailleur
9e06f185c5 Fix: Fix problem of invalid paypal link with \n. 2014-02-06 18:19:49 +01:00
Laurent Destailleur
c9b1c562cc Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-06 16:58:53 +01:00
Laurent Destailleur
7078970ed1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2014-02-05 21:03:05 +01:00
Laurent Destailleur
255a1f6497 Fix: String translated twice 2014-02-05 20:57:43 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
e3ac9db9ec Fix: Data was encode twice making bad translation for language with 
special chars.
 2014-02-05 12:11:39 +01:00
Laurent Destailleur
9a985821d2 Fix: doxygen 2014-02-04 21:08:25 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335 Fix: Missing vars and bar id. 2014-02-04 20:41:23 +01:00
Laurent Destailleur
408a028320 Fix: Must return a string 2014-02-03 20:07:25 +01:00
Laurent Destailleur
8f3e9b1832 Fix: function must return a string 2014-02-03 20:05:56 +01:00
Laurent Destailleur
89ebb3c0ef New: Add option MAIN_DISABLE_AJAX_COMBOX 2014-02-03 19:47:35 +01:00
Laurent Destailleur
efcff80a28 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/control
	htdocs/fourn/facture/paiement.php
 2014-02-03 18:44:48 +01:00
BENKE Charles
b86322c14a Update commonobject.class.php 
hook module need extrafields parameter too
 2014-02-01 12:55:05 +01:00
Laurent Destailleur
9aaafde6d5 Fix: Pb with cache files for graphical boxes: 
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
 2014-01-31 18:48:57 +01:00
Laurent Destailleur
ba931e18d4 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-31 18:12:54 +01:00
Laurent Destailleur
40a53d4b57 Fix: used bad constant name 2014-01-31 16:06:28 +01:00
Laurent Destailleur
7f15aa4582 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
 2014-01-31 10:12:41 +01:00
Laurent Destailleur
a2afea7ba9 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-30 18:21:04 +01:00
Laurent Destailleur
85436f871c Sec: Missing permission tests 2014-01-30 11:48:14 +01:00
Laurent Destailleur
0e9477167d Fix: Bad output of extrafields when list is used. 2014-01-30 11:47:25 +01:00
Laurent Destailleur
8abde9e11f Sec: Missing permission tests 2014-01-30 11:44:31 +01:00
Laurent Destailleur
5076e8ce4e Fix: Bad output of extrafields when list is used. 2014-01-30 10:48:10 +01:00
Laurent Destailleur
bd3a64d580 Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on 
detailed lines because this feature is currently bugged.
Should work when the 2 forms (predefined product and free product) will
be merged into one (planned for 3.6)
 2014-01-30 01:35:01 +01:00
BENKE Charles
a10ccb4d92 Update objectline_add.tpl.php 
Adding extra fields on line of element
 2014-01-29 16:45:37 +01:00
Florian Henry
779aaa51ab reset function2.lib.php to orign 2014-01-29 10:13:00 +01:00
Florian Henry
526c383f10 Add complete head into agenda 2014-01-29 10:11:39 +01:00
Florian Henry
ca556485e0 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-29 10:09:44 +01:00
Laurent Destailleur
ee41273286 Fix: Count of files were wrong 2014-01-26 19:27:42 +01:00
Laurent Destailleur
cd277aaf12 Fix: Missing translation 2014-01-26 19:10:05 +01:00
Laurent Destailleur
557fb0a9b1 Fix: miscellaneous css problems 
Fix: Version was missing into home page when login was already done.
 2014-01-26 18:30:45 +01:00
Laurent Destailleur
f50ad96beb Fix: var init at wrong place 2014-01-25 23:14:57 +01:00
Laurent Destailleur
1a35fb801a Fix: var init at wrong place 2014-01-25 23:14:25 +01:00
Laurent Destailleur
0a367f03a0 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-25 16:29:19 +01:00
Laurent Destailleur
7149fd76c7 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-01-25 16:28:21 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to 
add/replace action buttons into an element.
 2014-01-24 12:51:01 +01:00
Laurent Destailleur
101151630d Fix: doxygen errors 2014-01-24 10:38:45 +01:00
Laurent Destailleur
bdbbb580f8 Merge pull request #1381 from altairis-fr/clonepropal 
clone of propal improvements
 2014-01-24 01:33:15 -08:00
Laurent Destailleur
bb1575e0e6 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-24 10:20:03 +01:00
simnandez
a059b66b7d Fix: box of bank balances lines without decimals 2014-01-23 16:27:34 +01:00
simnandez
6fed307d70 Fix: box of bank balances lines without decimals 2014-01-23 16:26:07 +01:00
Florian Henry
a7c892e23b Fix Mask numbering 2014-01-21 14:18:00 +01:00
Laurent Destailleur
b8aee5f462 Merge pull request #1388 from FHenry/3.4 
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with date 2014-01-01)
 2014-01-21 04:59:43 -08:00
Florian Henry
cd84a5fd17 remove debug 2014-01-21 13:48:47 +01:00
Florian Henry
79c2e31439 Fix mask 2014-01-21 13:47:48 +01:00
Laurent Destailleur
3852fe4a1c Merge pull request #1380 from atm-alexis/3.5 
Add right to export project in export tool
 2014-01-21 04:30:35 -08:00
Laurent Destailleur
0a372a1c7d Merge remote-tracking branch 'origin/3.5' into develop 2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-01-21 13:23:27 +01:00
Léo
46926aa685 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 13:19:32 +01:00
Laurent Destailleur
709edca05c Merge pull request #1386 from zongap/patch-1 
Fix: modBarcode issue with blank list in conf (?)
 2014-01-21 04:11:32 -08:00
Florian Henry
163fcc8179 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-21 12:58:47 +01:00
Florian Henry
398e286be9 Fix reset Mask (befor do not work with FA{yy}{mm}-{0000@99} and date 
2014-01-01)
 2014-01-21 12:58:25 +01:00
Florian Henry
57f8f30494 Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with 
date 2014-01-01)
 2014-01-21 12:57:32 +01:00
Maxime Kohlhaas
60e616f63e Fix : big bug while importing thirds, codes were not properly set or not imported 2014-01-21 10:29:35 +01:00
Léo
6c00fc33f2 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 00:54:26 +01:00
Laurent Destailleur
e85cf332b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f New: Can call back barcode number from a product ref or thirdparty ref. 2014-01-20 17:18:56 +01:00
Laurent Destailleur
70debe9d9f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-20 11:25:58 +01:00
Laurent Destailleur
5b6b8f1d5b Fix: Support for reset everymonth (@99 into numbering mask) was ko when 
changing year.
 2014-01-20 11:20:38 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
1ebd56c4ee New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE 2014-01-20 00:40:01 +01:00
Laurent Destailleur
699a079ed7 New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and 
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
 2014-01-20 00:31:32 +01:00
Laurent Destailleur
73be349233 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 23:47:58 +01:00
Laurent Destailleur
5f58bff981 Use _ instead of - for option SUPPLIER_REF_IN_NAME 2014-01-19 22:59:37 +01:00
Laurent Destailleur
6253385b17 Fix: Thumbs was not visible when file was uploaded with extension in 
upper case.
 2014-01-19 22:51:24 +01:00
Laurent Destailleur
123cd787f5 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 22:44:34 +01:00
Laurent Destailleur
79e4c283db Fix: Deletion of files was broken 2014-01-19 22:43:36 +01:00
Laurent Destailleur
cbf6e8563d New: Add option SUPPLIER_REF_IN_NAME 2014-01-19 22:00:02 +01:00
Laurent Destailleur
becd65f9d3 Fix: Bad space into log 2014-01-19 21:34:48 +01:00
Laurent Destailleur
c7a73e4e00 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36 Fix: Missing the version into url 2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
031fd2f8b8 Fix: No set focus 2014-01-17 03:25:31 +01:00
Christophe Battarel
687fc1798b on clone of propal, copy contact informations 2014-01-16 11:43:59 +01:00
Christophe Battarel
0bdcd108f5 Add supplier informations in product export (supplier name, supplier product ref and supplier unit price) 2014-01-16 11:04:56 +01:00
Laurent Destailleur
c5bcc92651 Rename tag note to differentiate public and private note 2014-01-16 00:07:45 +01:00
Laurent Destailleur
aa69927089 Move table title nowrap tag at a better place. 2014-01-15 18:35:15 +01:00
Laurent Destailleur
ad5fc43e5b doxygen 2014-01-15 18:20:24 +01:00
Laurent Destailleur
b5620d5f15 New: The box "balance of bank accounts" show all opened accounts. 2014-01-15 17:52:16 +01:00
Alexis Algoud
9a5b46330a Add right to export project in export tool 
As the right does not exist, the tool could never be exploited
 2014-01-15 14:49:22 +01:00
Laurent Destailleur
c704182b4d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2014-01-14 18:01:39 +01:00
Laurent Destailleur
bd1a10c116 Fix: doxygen 2014-01-14 16:49:06 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Laurent Destailleur
795dcad59f Fix: The login page should have same code than standard page using 
common footer.
 2014-01-12 22:26:48 +01:00
Laurent Destailleur
4d298b1891 Update code comments and add log warning to help debug 2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961 Update code comments and add log warning to help debug 2014-01-12 20:02:41 +01:00
BENKE Charles
28204d66b1 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd Merge pull request #1372 from defrance69/patch-23 
Update modFacture.class.php
 2014-01-12 05:58:04 -08:00
Laurent Destailleur
06aa3b8250 Merge branch 'opensurvey-improvements' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements

Conflicts:
	ChangeLog
 2014-01-12 14:50:00 +01:00
Laurent Destailleur
02989b9f32 New: An external module can add tabs with a label that is a dynamic 
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
 2014-01-12 14:11:03 +01:00
Raphaël Doursenaud
78b40eaa8c Handle default session path nicely 2014-01-11 17:30:29 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
171e74ae7e Reduce time to hide/show 2014-01-11 13:31:12 +01:00
BENKE Charles
dd3da37ce6 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-10 10:35:42 +01:00
Laurent Destailleur
5bdd7fc074 Fix: Doxygen 2014-01-10 03:39:43 +01:00
Laurent Destailleur
9b9492a5d6 New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to 
automatically add timestamp and user line into comment. Remain to do:
Add button "cancel" into note edition mode.
 2014-01-10 01:31:23 +01:00
Laurent Destailleur
c3da8ca80a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-10 01:25:55 +01:00
Laurent Destailleur
7809e0baa9 Fix: dol_htmlentitiesbr behaviour was different if input was html 
or not. Add phpunit test to avoid that in future.
 2014-01-10 01:25:28 +01:00
Laurent Destailleur
7b63ce1f31 Doxygen 2014-01-10 00:57:17 +01:00
Laurent Destailleur
0b071ac4f1 Merge pull request #1369 from jfefe/fix_extrafield_list 
Fix : when using several field for label into sellist extrafields
 2014-01-09 06:41:27 -08:00
jfefe
77a1d6a43a Bad value display when using several label into sellist extrafield 2014-01-09 02:40:34 +01:00
jfefe
f554464690 New : ajax list for extrafields list and sellist 2014-01-09 02:10:03 +01:00
jfefe
f1d1522478 Fix : when using several field for label into sellist extrafields traduction is not needed. 
Without this, the list display "not defined". The key can't exists because label displayed is build from several field so we show raw data
 2014-01-09 01:49:59 +01:00
Laurent Destailleur
c0c555b78f Fix: A lot of fix into sticker sheet dimension management. 
Fix: Size of font too large to print sticker pages.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-08 15:16:56 +01:00
Laurent Destailleur
622fe72abf Fix: A lot of fix into sticker sheet dimension management. 
Fix: Size of font too large to print sticker pages.
 2014-01-08 15:13:41 +01:00
Laurent Destailleur
6ff337ccad New: Add option 'aZ' into GETPOST function to check parameters 
contains only a to z or A to Z characters.
 2014-01-08 00:10:39 +01:00
Laurent Destailleur
77cfdfd59e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-08 00:05:59 +01:00
Laurent Destailleur
0e3757aa5c New: Add option 'az' into GETPOST 2014-01-08 00:05:14 +01:00
Laurent Destailleur
c7ef0b7c57 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/consumption.php
 2014-01-07 16:41:00 +01:00
Laurent Destailleur
4d379e572a Fix: Bugs into permissions for module category 2014-01-07 15:35:26 +01:00
Laurent Destailleur
89c772459f Fix: Bugs into permissions for module category 2014-01-07 14:55:03 +01:00
Laurent Destailleur
e99883f1a6 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/admin/modules.php
 2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2014-01-06 19:13:40 +01:00
Laurent Destailleur
ab7a17fe73 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-01-06 19:12:06 +01:00
Laurent Destailleur
0e3184c436 Fix: W3C. 
Fix: Permission on a button.
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/soc.php

Fix: Some menu entry not visible.
 2014-01-06 17:17:57 +01:00
Laurent Destailleur
555170e573 Fix: W3C. 
Fix: Permission on a button.
Fix: Some menu entry not visible.
 2014-01-06 17:14:13 +01:00
Laurent Destailleur
7fd34e5ff6 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
 2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
 2014-01-06 12:42:50 +01:00
Marcos García de La Fuente
2393e7c732 Moved creation poll wizard out of public folder 2014-01-05 19:03:33 +01:00
Laurent Destailleur
2d8214a940 Fix: The delete button into ecm module does not work when ajax disabled. 2014-01-05 18:37:26 +01:00
Laurent Destailleur
5b40eff0fa Fix: W3C. Input fields can be between a table and tr tag. 2014-01-05 18:30:35 +01:00
Laurent Destailleur
667908baf8 Fix: Missing lang loading 2014-01-05 16:37:33 +01:00
Laurent Destailleur
9a6f22a86e Fix: W3C no form into table. 
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
 2014-01-05 15:46:39 +01:00
Marcos García de La Fuente
8d96675607 Force logged user to create surveys and applied Dolibarr style to poll creation wizard 2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
6397b0b7aa Improving the use of permissions in opensurvey module 2014-01-05 06:18:26 +01:00
Laurent Destailleur
5a7fe6b4a7 Fix: Change to make debian package ok despite removal of ckeditor 
package.
 2014-01-05 01:17:38 +01:00
Laurent Destailleur
d2d0d715a9 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/install/mysql/data/llx_c_tva.sql
 2014-01-04 19:02:56 +01:00
Laurent Destailleur
2ee5076970 Problem of key of language into auguria menu 2014-01-04 18:57:57 +01:00
Laurent Destailleur
77e2d49658 Merge pull request #1358 from marcosgdf/payment_menu 
Fixed quality control checks for PR #1357
 2014-01-04 09:45:12 -08:00
Laurent Destailleur
ee1e7471ff Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405 Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
 2014-01-04 16:13:34 +01:00
Laurent Destailleur
f6cda9deb6 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:40:13 +01:00
Laurent Destailleur
6c3c66c45d New: Add menu entry to barcode genration page. 2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:26:31 +01:00
Marcos García de La Fuente
694fd5810a Removed unuseful opensurvey admin page 2014-01-03 00:44:56 +01:00
Laurent Destailleur
601b2744e0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	build/debian/changelog
 2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096 Fix: doxygen 2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:49:36 +01:00
Laurent Destailleur
5551a5d4b4 Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.
 2014-01-02 20:45:59 +01:00
Marcos García de La Fuente
44ab26698e Fixed (again) quality code control checks 2014-01-02 16:41:23 +01:00
Laurent Destailleur
504b519fb7 Fix: Bad link for download file into documents page of supplier invoices 2014-01-01 18:37:06 +01:00
Laurent Destailleur
5fd47b34b0 Fix: Bad link for download file into documents page of supplier invoices 2014-01-01 18:30:32 +01:00
Laurent Destailleur
eadccb5d9b Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.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/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/margins.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/agenda.lang
	htdocs/langs/lv_LV/banks.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/lv_LV/boxes.lang
	htdocs/langs/lv_LV/opensurvey.lang
	htdocs/langs/lv_LV/users.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/cron.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/help.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/margins.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/uz_UZ/main.lang
 2013-12-31 12:18:31 +01:00
Laurent Destailleur
e142bd252d Fix: disable code making jmobile crazy. 2013-12-31 10:48:15 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584 Fix: Better translation 2013-12-29 19:30:11 +01:00
Marcos García de La Fuente
9b90e93fe5 Forgot typehinting for function payment_supplier_prepare_head 2013-12-28 23:24:24 +01:00
Marcos García de La Fuente
c6ded35d4b Fixed quality control checks for PR #1357 2013-12-28 23:13:32 +01:00
Laurent Destailleur
49f3242796 Merge pull request #1357 from marcosgdf/payment_menu 
Payment menu
 2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +01:00
Marcos García de La Fuente
917ddf0dee Payments and Supplier payment pages tabs can now be extended from modules. 2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/product/liste.php
 2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191 Fix: Can import contacts not linked to any thirdparties. 2013-12-24 16:11:23 +01:00
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
Laurent Destailleur
b35f44e3cb New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs 
when you use the "print" view on screen.
 2013-12-19 20:57:13 +01:00
Laurent Destailleur
11e0fb8f7a Fix: Missing ref field into export. 2013-12-17 09:11:36 +01:00
Laurent Destailleur
1dca56c213 Fix: Calculation of number of linked files was not working on taxes. 2013-12-16 23:45:12 +01:00
Laurent Destailleur
ca36a4dd97 Merge pull request #1348 from atm-alexis/3.5 
Improper use of delete() function and ldap with multientity bug corrections
 2013-12-16 05:26:31 -08:00
Alexis Algoud
ba70794c1d Add multicompany->enabled test 2013-12-16 09:45:38 +01:00
Laurent Destailleur
6946fdbcda Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a Fix: Missing special code 2013-12-15 21:10:39 +01:00
Laurent Destailleur
3c87e1e20d Fix: no required class for not mandatory fields 2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
c34e50114a Start to work on a basic print sticker tool 2013-12-15 03:23:10 +01:00
Laurent Destailleur
fbeb61861a Start to remove too low level permission. Philisophy of dolibarr is 
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
 2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc754bbdc2 Fix: Trigger name conflicts and reference file was not matching real 
name of triggers.
 2013-12-14 20:48:34 +01:00
Laurent Destailleur
db10740e2a Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks 
Feature/multicompanybookmarks
 2013-12-13 18:52:38 -08:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
 2013-12-14 03:13:46 +01:00
Laurent Destailleur
42f032ded3 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-14 01:30:15 +01:00
Laurent Destailleur
8d872ab4fb Uniformize code and more comments 2013-12-14 00:24:43 +01:00
Laurent Destailleur
2f5932026e More information returned into return code 2013-12-13 18:33:05 +01:00
Laurent Destailleur
9a07f31a8c Doxygen 
Bad translation
 2013-12-13 17:36:43 +01:00
Alexis Algoud
4844aed67e Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-12-11 15:15:30 +01:00
Regis Houssin
0247241277 Fix: wrong path with multicompany module 2013-12-11 12:23:36 +01:00
Laurent Destailleur
286bdf91d4 Better detection of corrupted module files. 2013-12-10 18:52:48 +01:00
Laurent Destailleur
c3c6588426 Better detection of corrupted module files. 2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303 New: Add path file of trigger into admin trigger list page 2013-12-10 15:49:57 +01:00
Raphaël Doursenaud
071dd8e758 Make bookmarks module multicompany aware 2013-12-10 12:00:42 +01:00
Laurent Destailleur
f804833b9c Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2013-12-08 22:38:10 +01:00
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