Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,918 Commits 36 Branches 190 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

49918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d71ccc4a02 NEW The free text in PDF footer can now be a HTML content. So the 
WYSIWYG editor is on by default to edit it into module setup.
 2015-10-19 14:39:55 +02:00
Laurent Destailleur
18725b554b Option MAIN_REPLACE_TRANS_xx_XX is now completely implemented. 2015-10-19 13:23:45 +02:00
Laurent Destailleur
dcf7d344cd Prepare database for future portal website 2015-10-19 12:54:22 +02:00
Laurent Destailleur
e43f1cee7b Better error message 2015-10-19 10:52:46 +02:00
Laurent Destailleur
b9001d7ab8 NEW Prepare database to store information per files (for example to 
define if an image ca, be used as a cover or not)
 2015-10-18 22:43:19 +02:00
Laurent Destailleur
9ad998d0be Add comments 2015-10-18 21:51:09 +02:00
Laurent Destailleur
a90c5ce962 Revert "Add currently used sortfields and sortorder" 
This reverts commit 0663932589.
 2015-10-18 21:48:17 +02:00
Laurent Destailleur
81580f75b9 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture.php
 2015-10-18 21:22:42 +02:00
Laurent Destailleur
bf6b48f5a0 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-18 21:17:29 +02:00
Laurent Destailleur
afe4057a97 FIX #3757 Can't set amount in a social contribution with some languages 2015-10-18 21:17:19 +02:00
Laurent Destailleur
ccce974476 Fix #3766 2015-10-18 21:00:19 +02:00
Laurent Destailleur
2ad805912d Fix #3765 2015-10-18 20:58:39 +02:00
Laurent Destailleur
fc1718c0d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-18 20:57:39 +02:00
Laurent Destailleur
a0e30aa218 Fix #3764 2015-10-18 20:57:28 +02:00
Laurent Destailleur
d0e590f8ea Move variables 2015-10-18 20:56:10 +02:00
Laurent Destailleur
4dc88406ac Merge pull request #3737 from frederic34/patch-15 
Bad chmod for directory when changing product ref
 2015-10-18 20:28:17 +02:00
Laurent Destailleur
be8e7515a1 Merge pull request #3762 from simnandez/3.8 
Fix: Last page total is 0
 2015-10-18 20:27:17 +02:00
Laurent Destailleur
b5401edf16 Merge pull request #3769 from marcosgdf/task-3768 
NEW [ task #3768 ] Improve product multiprices view
 2015-10-18 20:26:50 +02:00
Laurent Destailleur
c64c1a0201 FIX If no end date is set on survey, we should be able to vote. 2015-10-18 20:11:26 +02:00
Marcos García de La Fuente
12de2d5947 NEW [ task #3768 ] Improve product multiprices view 
Close #3768
 2015-10-18 19:34:27 +02:00
Laurent Destailleur
420bfd8301 FIX Preview pages was not using correct style for ref 2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39 FIX The preview of PDF was never refreshed if PDF document was changed 2015-10-18 18:54:54 +02:00
Juanjo Menent
1f05cb844c Merge pull request #3755 from grandoc/develop 
[Qual] Uniformize code
 2015-10-18 12:35:17 +02:00
Juanjo Menent
02c1f37a95 Merge pull request #3747 from fappels/develop-best-pmp-pos-margin 
Qual getSupplierPrices
 2015-10-18 12:10:29 +02:00
Juanjo Menent
16f473f6a4 Merge pull request #3758 from frederic34/patch-16 
Create index.html
 2015-10-18 12:06:12 +02:00
Juanjo Menent
724470788b Merge pull request #3759 from frederic34/patch-17 
Create index.html
 2015-10-18 12:06:01 +02:00
Juanjo Menent
334c14d088 Fix: Last page total is 0 2015-10-18 11:56:42 +02:00
Frédéric FRANCE
c80c0f2c2c Create index.html 2015-10-18 10:07:08 +02:00
Frédéric FRANCE
8e5c7746dc Create index.html 2015-10-18 10:06:35 +02:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
0211ad64ee FIX Total in summary was not same than into detail on the referrer page. 
Conflicts:
	htdocs/product/stats/facture.php
 2015-10-17 12:36:51 +02:00
Laurent Destailleur
2f46683526 FIX Total in summary was not same than into detail on the referrer page. 2015-10-17 12:28:47 +02:00
Laurent Destailleur
3d94e3d80e FIX Editing a supplier price should keep the vat. 2015-10-17 12:01:17 +02:00
Laurent Destailleur
4eb7e023ed Merge pull request #3752 from All-3kcis/develop-patch-9 
Correct hook param name
 2015-10-17 11:18:47 +02:00
Laurent Destailleur
5c1daa6135 Merge pull request #3746 from atm-gauthier/3.8_fix_function_update_extra 
FIX : 1/ update_extra() function musn't be in  "if(!empty(MAIN_DISABL…
 2015-10-17 10:39:37 +02:00
Laurent Destailleur
fc8f4b4d6e Merge pull request #3745 from atm-arnaud/3.8_fix_propale_facturee 
FIX bug invoice classified in propale next update commonobject class …
 2015-10-17 10:38:35 +02:00
Laurent Destailleur
bba8db2b60 Merge pull request #3744 from atm-gauthier/3.8_fix_thirdparty_parent 
FIX : Societe::set_parent() function needs societe object to be fetch…
 2015-10-17 10:37:36 +02:00
Laurent Destailleur
5db82b8869 Merge pull request #3743 from hregis/develop_origin 
Fix: Parse error: syntax error, unexpected '}'
 2015-10-17 10:37:03 +02:00
Laurent Destailleur
686a923974 Merge pull request #3754 from frederic34/patch-16 
FIX Update status of fournisseur.commande.class.php
 2015-10-17 10:36:09 +02:00
Frédéric FRANCE
d68db2a844 Update fournisseur.commande.class.php 2015-10-17 08:48:53 +02:00
Laurent Destailleur
91a2341e88 Add missing column 2015-10-17 03:32:19 +02:00
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
b748c4e328 Uniformize code 2015-10-17 02:03:59 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must 
include a print before. It is no more included into function.
 2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a Uniformize code and use a new generic search architecture 2015-10-17 01:40:46 +02:00
Laurent Destailleur
a2382bdde3 FIX Type of leave request is required 2015-10-17 01:32:05 +02:00
Laurent Destailleur
4e3ee259b0 Update doc 2015-10-17 01:09:56 +02:00
Laurent Destailleur
2122d4d43a NEW Contract module can be used to follow both sold and bought 
contracts/recurring subscriptions.
 2015-10-17 00:52:35 +02:00
Laurent Destailleur
537a13e2f4 NEW Show which fields are used for search when doing a generic search 
from the quick search form.
 2015-10-17 00:14:36 +02:00