Commit Graph

43796 Commits

Author SHA1 Message Date
Cubexed
fe9e7a0fa9 Revert "Closed projects are greyed out in project selector"
This reverts commit 68994823dd.
2014-09-17 15:41:46 +02:00
Laurent Destailleur
900cdd5368 Qual: Removed duplicate page. 2014-09-17 15:24:01 +02:00
Laurent Destailleur
d976a5575b New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto
PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
2014-09-17 14:36:04 +02:00
Laurent Destailleur
9c54dc57df Save some usefull cleaning requests into repair.sql 2014-09-17 12:31:35 +02:00
Laurent Destailleur
6eb3fe1ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-17 01:13:20 +02:00
Laurent Destailleur
a834796181 New: Content of predefined email come firstly from table
llx_c_email_template, then translation key.
2014-09-17 01:12:59 +02:00
Marcos García de La Fuente
9ae7486555 Removed deprecated usage of supplier_order_pdf_create and supplier_invoice_pdf_create 2014-09-16 21:42:07 +02:00
aspangaro
5216bbca72 Traduce button 2014-09-16 21:31:58 +02:00
Raphaël Doursenaud
b9954f5b2b PHP 5.6 compatibility
$HTTP_RAW_POST_DATA is now DEPRECATED
Replaced all usages by the recommended file_get_contents("php://input")
2014-09-16 21:21:34 +02:00
Florian HENRY
15d680ea4b bad mege 2014-09-16 21:19:52 +02:00
Florian HENRY
fc65421b2e bad merge 2014-09-16 21:19:07 +02:00
Florian HENRY
32c777a78b Fix bad merge 2014-09-16 21:17:22 +02:00
Florian HENRY
bb612d24db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/resultat/index.php
2014-09-16 21:09:53 +02:00
Florian HENRY
14ab058f34 Add Dunning into compta report 2014-09-16 21:05:57 +02:00
Marcos García de La Fuente
3561c8e6f3 Removed deprecated usage of propale_pdf_create 2014-09-16 20:57:17 +02:00
Marcos García de La Fuente
9dbf054026 Removed deprecated usage of project_pdf_create 2014-09-16 20:53:43 +02:00
Marcos García de La Fuente
4b3191b64e Removed deprecated usage of facture_pdf_create 2014-09-16 20:49:05 +02:00
Marcos García de La Fuente
610dc8cd0c Removed deprecated usage of expedition_pdf_create 2014-09-16 20:38:28 +02:00
Marcos García de La Fuente
c195c6fd10 Removed deprecated usage of commande_pdf_create 2014-09-16 20:35:31 +02:00
aspangaro
28e20f1826 typo of link into eldy menu 2014-09-16 20:06:31 +02:00
aspangaro
db4be17f5b Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-16 20:02:50 +02:00
braito4
144da16391 Missing date_start, date_end in webserver server_invoice.php 2014-09-16 19:42:11 +02:00
braito4
b7ef2db5d9 problem with type of product
the column should be product_type
2014-09-16 19:33:07 +02:00
Cubexed
c3b255bce9 Changed sql to be portable 2014-09-16 15:27:04 +02:00
Marcos García de La Fuente
e71dc6bc32 Created a method generateDocument for several classes
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
2014-09-16 12:30:37 +02:00
Juanjo Menent
d1879c1b9f Qual: Remove unused code 2014-09-16 11:19:22 +02:00
aspangaro
e1a40bd8bd Merge remote-tracking branch 'Upstream/develop' into develop-cheque 2014-09-16 07:23:55 +02:00
aspangaro
0f3db1e912 Add more search field in list of cheque deposits 2014-09-16 07:21:29 +02:00
Laurent Destailleur
2c0a2937f6 Merge pull request #1887 from FHenry/3.5
add refext into fecth product
2014-09-15 23:19:58 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
9c70c2c3d0 Fix: cents for indian ruppes are calle paisa and paise. 2014-09-15 22:43:49 +02:00
aspangaro
d4bcea0799 Correct bank journal 2014-09-15 20:30:03 +02:00
Laurent Destailleur
fffb0f1bde Fix: bad translation key 2014-09-15 20:23:04 +02:00
Laurent Destailleur
d8e8b34605 Fix: Removed AGENDA_DEFAULT_TYPE. There is already
AGENDA_DEFAULT_FILTER_TYPE.
2014-09-15 19:35:54 +02:00
Laurent Destailleur
8487913209 Fix: default setup of type of action 2014-09-15 19:27:45 +02:00
Laurent Destailleur
c97692a664 Ajout backtopag sur page peruser. 2014-09-15 19:21:30 +02:00
Laurent Destailleur
06dbc4e36c Qual: Uniformize var $backtopage (no more $backtourl vars) 2014-09-15 19:14:10 +02:00
Laurent Destailleur
9ea3e33f94 Fix: Can edit status of event.
New: Onto event summary of elements, end date and status are visible.
2014-09-15 19:04:30 +02:00
Laurent Destailleur
19e2bd8c90 New: Add option AGENDA_DEFAULT_TYPE
Fix: id is not set on field.
2014-09-15 17:34:32 +02:00
Laurent Destailleur
7fc8799c3d Qual: Clean code from user table tr td 2014-09-15 16:18:19 +02:00
Laurent Destailleur
0d6d064e7e New: PDF event report show project and status of event
Fix: Can edit description of intervention
New: Show status of object on refere page.
2014-09-15 12:48:24 +02:00
Laurent Destailleur
2dbbc76645 Fix: Trigger error not reported 2014-09-15 11:48:50 +02:00
Laurent Destailleur
b94d913440 New: Add option AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS to
automatically set end date of event to start date + delta on creation
page.
2014-09-15 10:19:08 +02:00
Laurent Destailleur
a0543d1752 Fix: No picto if no data 2014-09-15 09:59:08 +02:00
Florian HENRY
9493e252c9 add refext into fecth product 2014-09-15 09:56:40 +02:00
Laurent Destailleur
6f718af1b6 Fix: list of interventions of thirdparties 2014-09-15 09:29:40 +02:00
Laurent Destailleur
17f1638ec2 Sync from transifex 2014-09-15 09:11:16 +02:00
Laurent Destailleur
14889f0c11 Fix conflict 2014-09-15 08:53:43 +02:00
Laurent Destailleur
76ba3301c3 Fix: Syntax for license key 2014-09-14 22:34:17 +02:00