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

936 Commits

Author SHA1 Message Date
Laurent Destailleur
2dbbc76645 Fix: Trigger error not reported 2014-09-15 11:48:50 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
frederic34
2df2c12cfd The delivery method is transmited in shipment 2014-07-25 21:50:21 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
Laurent Destailleur
5e75dd27e8 Merge pull request #1719 from frederic34/selectbank 
Select bank account for propal order and invoice
 2014-07-11 12:29:21 +02:00
frederic34
f29eeceb1a Select bank account for propal and order 2014-07-06 20:49:34 +02:00
KreizIT
fc6382ea7e Fix: [ bug #1463, #1464 ] Proposal triggers problem 2014-07-04 15:15:36 +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
Juanjo Menent
811ac6701a [ task #1063 ] Allow edit localtaxes rate for thirds. Works with propals 2014-07-04 11:02:41 +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
79dec7ad90 Merge pull request #1641 from defrance69/patch-17 
Patch 17
 2014-06-26 21:43:45 +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
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Laurent Destailleur
2edfcc2583 Fix: ref was not set on object after renamed 2014-06-12 15:56:38 +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
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
BENKE Charles
d0bab2f7e2 Update propal.class.php 
research additionnal models numbering in additional modules folders
 2014-06-06 12:29:20 +02:00
nicolasb827
c3ebece1ef fix update SQL request 2014-05-28 01:25:36 +02:00
nicolasb827
83aba41c6c copy type on line update 2014-05-28 01:18:31 +02:00
nicolasb827
c091009afb fetch product_type field from DB 
When loading propal line on edit, product_type is reset to 0
 2014-05-28 01:07:27 +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
Florian HENRY
5a5c858578 [ bug #1399 ] [pgsql] Silent warning when setting a propal as 
"facturée" in propal.php
 2014-05-19 16:21:59 +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
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
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
Laurent Destailleur
693529c40b Merge pull request #1549 from atm-maxime/develop 
Fix : proposal validation was converting third as customer
 2014-04-23 21:18:34 +02:00
Maxime Kohlhaas
d21ea0fe19 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-04-23 17:51:22 +02:00
Maxime Kohlhaas
b9865b9ccc Fix : proposal validation was converting third as customer 2014-04-23 17:50:47 +02:00
BENKE Charles
ad9efb3961 Update propal.class.php 
it's this->lines who used on create propal function not this->products
 2014-04-21 15:40:08 +02:00
BENKE Charles
f1d9cebb93 Update propal.class.php 
refactoring LibStatut function (small is better)
 2014-03-31 02:38:07 +02: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
7db903e671 Fix: special code was lost during update 2014-03-01 16:58:10 +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
213a64edcc Fix for missing param. 2014-02-10 01:36:15 +01:00
Christophe Battarel
81bae5fff9 fix wrong constant usage 2014-01-21 18:33:25 +01:00
Christophe Battarel
7d04944ca7 don't reset ref_client if same customer and MAIN_KEEP_REF_CUSTOMER_ON_CLONING 2014-01-16 11:48:48 +01:00
Christophe Battarel
687fc1798b on clone of propal, copy contact informations 2014-01-16 11:43:59 +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
Laurent Destailleur
bba2892752 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/commande/liste.php
 2013-12-15 02:02:24 +01:00
Laurent Destailleur
db9ef992eb Fix: Clean var 2013-12-14 17:25:57 +01:00
Alexis Algoud
895f5452b4 In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted. 
Ex in agefodd module:
	$obj_link=new Propal($db);
        $obj_link->id=$agf->propalid;
        $resultdel=$obj_link->delete($user);

To prevent misuse of the function, the reference is not considered given
 2013-12-11 15:14:29 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Raphaël Doursenaud
9be462e43c Text is not a type, let's use string 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
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
8907c9944d Assigments in conditions is often considered bad practice 
So let's put a comment, just in case
 2013-11-07 20:51:30 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
Laurent Destailleur
949b8c6274 Mark method classer_facturee deprecated. 
Make better translation of some workflow options.
 2013-09-16 11:50:53 +02:00
Laurent Destailleur
b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php
 2013-09-13 09:32:41 +02:00
simnandez
002e248f00 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:55:49 +02:00
simnandez
817569d487 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:54:47 +02:00
simnandez
b36dc08e00 Remove unnecessary code 2013-09-12 09:59:23 +02:00
simnandez
699414cab7 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 18:45:16 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00
Christophe Battarel
9fa37fc5f1 Fix: Edit propal line was losing product supplier price id 
Conflicts:
	ChangeLog
 2013-09-08 21:51:08 +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
Florian Henry
d09af2b18e Better use of reopen method 2013-07-15 09:37:55 +02:00
Florian Henry
9d0fe3c1da Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN 2013-07-15 09:33:26 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was 
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
 2013-07-10 17:29:54 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines 
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
 2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
fhenry
e19e9e1c63 Add dol_syslog 2013-05-17 21:27:15 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
53ca1546d0 Fetch optionnal into fetch of propal 2013-04-26 16:58:04 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
fhenry
52a1e81147 [ bug #842 ] Erreur SQL Propal 2013-04-23 14:43:32 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock 
fix [ bug #842 ] Erreur SQL Propal
 2013-04-23 14:02:29 +02:00
fhenry
acd3d136b5 [ task #798 ] Add range limit date on product/services as it is done on 
order and invoice
 2013-04-15 15:31:12 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
jfefe
71bb4149cc New : Automatic creation of the document to the closing of the propale depending on the model selected in the configuration 2013-03-16 02:08:07 +01:00
jfefe
8b749eaafc Fix : extrafields are not saved on update (propale) 2013-03-06 01:34:32 +01:00
jfefe
9eee5f9509 Fix : extrafields for propale were note saved after creation 2013-03-06 00:18:41 +01:00
jfefe
3cefb62621 Fix : incorrect function used to retrieve extrafields for propal 2013-03-05 22:22:10 +01:00
jfefe
59627408c0 Edit extrafields on propal 2013-03-04 19:17:11 +01:00
jfefe
f335c4f306 New : add extrafield support on propal object 2013-03-04 18:22:25 +01:00
simnandez
7d9d575e40 [ task #731 ] Uniformize ref generation. Propals 2013-03-02 15:57:26 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
Grand Philippe
785e72d533 fix trad : change adresse versus address 2013-02-15 19:36:09 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Regis Houssin
e8ce9cecf2 Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:35:15 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
fhenry
ff06b05b3d Fix Bug [ bug #681 ] Can't modify a line a business proposal 2013-01-15 23:04:42 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test. 
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
 2012-11-03 16:32:49 +01:00
Laurent Destailleur
9bee735c2d Fix: Bad code for specimen 2012-10-30 12:02:13 +01:00
Laurent Destailleur
7385ea15db Doxygen 2012-10-13 13:03:39 +02:00
simnandez
b7837f9280 Fix: Localtaxes type only missing in propal update line 2012-09-18 18:18:30 +02:00
simnandez
76f3fb56ea Fix: Add type of product/service into propals for a correct localtaxes 
calculation
Fix: Localtax2_type for Spain must be 3
 2012-09-18 16:06:45 +02:00
simnandez
2e37084c55 Fix: If price is 'TTC' we need to have the totals without VAT for a 
correct
calculation
Fix: The updateline of propal must include the localtaxes totals
 2012-09-12 17:48:45 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Laurent Destailleur
35a0311d28 Fix: Checkstyle 2012-08-26 23:15:26 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Regis Houssin
2e73cd7ddf Fix: missing fields and compatibility with milestone 2012-08-01 17:38:10 +02:00
Regis Houssin
e44fd4885d Fix: change the last $DB to $db 2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML 
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
 2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
beedf13324 Fix: restore broken feature, disable token renewal in ajax response 2012-07-29 09:54:58 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Marcos García
e6a192ba87 Renamed fk_demand_reason to fk_input_reason 2012-07-22 16:53:02 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
b5c92c7b46 correction in getlinesarray 2012-07-19 10:15:59 +02:00
Christophe Battarel
bd05495375 correct syntax error 2012-07-18 16:45:34 +02:00
Christophe Battarel
c0ac8c9ae1 fetch margin infos on line object 2012-07-18 15:50:37 +02:00
Christophe Battarel
122fc5eaa7 update propales for margins 2012-07-18 15:15:54 +02:00
Regis Houssin
69ebda8ddb Fix: regression corrected 2012-07-08 12:18:29 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
bf379fc242 Fix: uniformize code 2012-06-11 21:45:59 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external 
modules
 2012-05-30 00:07:06 +02:00
Laurent Destailleur
81be50b91b Fix: [ bug #411 ] Can't modify most properties 2012-05-23 11:21:51 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Regis Houssin
5d2da2c884 Fix: uniformize code 2012-03-22 08:33:44 +01:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Regis Houssin
3afb2878c2 Fix: broken indentation 2012-03-18 20:45:01 +01:00
Regis Houssin
4ecc64504d Fix: use the original json functions 2012-03-18 19:59:38 +01:00
Laurent Destailleur
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
Regis Houssin
ccf1665837 Fix: missing status after set draft 2012-03-16 17:37:18 +01:00
Regis Houssin
391ce8490f New: add "extraparams" field for stock extra parameters with json 2012-03-16 14:32:37 +01:00
Regis Houssin
5fbd8e4cee Fix: move method in common class 2012-03-14 11:11:46 +01:00
Regis Houssin
4d1416d0e6 Fix: remove unused and deprecated method 2012-03-13 20:15:13 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3 Fix: move method in common class 2012-03-13 19:24:11 +01:00
Regis Houssin
e033f202d1 Fix: more clickless, remove "note" tab 2012-03-12 17:49:53 +08:00
Regis Houssin
ef7cd26ef2 Fix: wrong field name 2012-03-04 10:26:01 +01:00
Regis Houssin
5e402f667e Fix: php unit test warning 2012-03-04 10:13:52 +01:00
Regis Houssin
c3e245d24e Fix: start triggers before delete objects 2012-02-15 15:16:33 +01:00
Regis Houssin
6f3f1204fe Fix: delete linked object in propal delete function and uniformize code 2012-02-13 18:27:42 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Laurent Destailleur
186258410e New: Add option to clean orphelins files into repair page 2012-02-08 16:41:06 +01:00
Laurent Destailleur
6cb0685b6f Qual: Uniformize hook names. All hooks to add information on 
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
 2012-02-06 17:18:19 +01:00
Laurent Destailleur
5974cde154 New: Automtic list of documents in ECM module is ok for customers, 
suppliers invoice, orders, customers orders, proposals and social
contributions.
 2012-02-06 14:34:58 +01:00
Laurent Destailleur
83d63aa07b Fix: Date not initialized 2012-01-11 13:42:44 +01:00
Laurent Destailleur
a7e7450dd7 Fix: Error management if date is empty 2012-01-11 13:37:50 +01:00
simnandez
5ad9d7cb61 [ task #176 ] Allow to use ODT templates for prososal like it's done for 
invoices. Working with odt template
 2012-01-05 09:48:28 +01:00
Laurent Destailleur
b78541a167 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-12-16 15:02:56 +01:00
Laurent Destailleur
b54da5a719 New: Can open back a commercial proposal 2011-12-16 14:59:09 +01:00
Juanjo Menent
83bef28418 Qual: Uniformize code 2011-12-16 12:47:23 +01:00
Juanjo Menent
e652674784 Qual: Uniformize code 2011-12-14 18:09:34 +01:00
Regis Houssin
ec327c5330 Fix: remove unused parameters 
Fix: use dol_clone instead fetch
 2011-12-12 13:42:19 +01:00
Laurent Destailleur
ebea7f6c97 Fix: fix not initialized variables 2011-12-05 18:36:54 +01:00
Laurent Destailleur
1770a46519 Qual: Removed tons of warning 2011-11-22 14:00:03 +01:00
Laurent Destailleur
8d46ae1d35 Qual: Better error managment on numbering setup 2011-11-06 15:12:18 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +01:00
Laurent Destailleur
c16c09a451 Qual: Mutualize code to delete previews 2011-11-04 00:27:30 +01:00
Laurent Destailleur
7f0cca8fb9 Look: Enhancements into themes. 2011-11-03 01:59:13 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
24c9a7d26d Fix: reorder line after update line with fk_parent_line 2011-10-06 00:11:53 +08:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
ebfc56e75f Fix: replace siezof by count 
Fix: update exclude dir
 2011-09-20 14:36:57 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
2a672b3d02 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
bf1a49c75d Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
5a951a86b5 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
d56fc98ed3 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
e8360b8b95 Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
bb24986a6e Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
6f7053dbcc Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
ac7b8484de Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
d7b943ec0f Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
7419982316 Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
7d5aef30c4 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
75dc8c84f7 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
6c030ab34b Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
821a864383 Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
6ce3a1b475 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
d0114638c2 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
48625a0793 Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
9ebbeb573c Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
dfaa066042 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
e7fb7b74e1 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
c4a496cd05 Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
9e900196fb Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
d9408d1847 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
b8a377fa8f Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
411b3415eb Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
a82261068f Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
351a2974dd Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
044879c838 Doxygen 2011-09-02 23:57:26 +00:00
Laurent Destailleur
0e2946cec7 Doxygen 2011-09-03 00:19:56 +00:00
Laurent Destailleur
e5988ad241 Fix: Error management when adding notification 2011-09-02 23:41:55 +00:00
Laurent Destailleur
2d89e6609e Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
5be5852cf4 Fix: Third party emails must not be visible into notification page 2011-09-02 23:07:47 +00:00
Laurent Destailleur
42c86ce1ac Work on rpm package 2011-09-03 01:46:33 +00:00
Juanjo Menent
cac55067fb Qual: Uniformize code 2011-09-02 22:33:28 +00:00
Laurent Destailleur
55c5c5f9f5 Work on rpm package 2011-09-03 01:27:00 +00:00
Laurent Destailleur
f5f37fa8dc Qual: Uniformize code 2011-09-02 16:33:11 +00:00
Laurent Destailleur
d53b179102 Fix: Fix GNU address 
Doxygen
 2011-09-03 01:24:09 +00:00
Laurent Destailleur
f39c932b2e Qual: Uniformize code 2011-09-02 16:25:07 +00:00
Laurent Destailleur
26badd59f4 Doxygen 2011-09-03 00:27:02 +00:00
Juanjo Menent
116e215323 Uniformize code 2011-09-02 15:41:35 +00:00
Laurent Destailleur
1ca46d8ec4 Doxygen 2011-09-03 00:19:56 +00:00
Juanjo Menent
8f19ee66e4 Uniformize code 2011-09-02 14:31:53 +00:00
Laurent Destailleur
d1d145620d Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
1aaf65c257 PDF works with us letter format 2011-08-31 14:42:47 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
9f663d5677 Qual: Clean code 2011-08-20 15:11:31 +00:00
Laurent Destailleur
acea604e54 Change signature of all call executHooks. 
Now they accept all the following signature:
executeHooks('method',$parameters,$object,$action)
 2011-08-10 22:47:33 +00:00
Regis Houssin
66d5d6905f Fix: works on repair broken features 2011-08-10 19:55:21 +00:00
Laurent Destailleur
02c9c563e0 Fix: When a line is defined as option, it was not possible to remove "options" then. 2011-08-08 01:53:25 +00:00
Laurent Destailleur
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Regis Houssin
f344dbdefe Fix: Name of hook must also be unique for each tab 2011-06-30 13:27:20 +00:00
Regis Houssin
039ac047f4 New: add possibility to change the default status label 2011-06-22 07:43:12 +00:00
Laurent Destailleur
66df4de8be New: Graph js librairie can accept colors and mix bar with plots. 2011-06-06 22:13:43 +00:00
Regis Houssin
8e25cb1ae5 Fix: possibility to have more hooks in the same page 
New: add left search block hook and extra left block hook
 2011-05-31 14:04:45 +00:00
Regis Houssin
8d46f44e1f Fix: uniformize code 2011-05-26 12:19:21 +00:00
Regis Houssin
56ac9ac8b7 Fix: uniformize code 2011-05-26 10:07:14 +00:00
Regis Houssin
59aad44353 Fix: uniformize code 2011-05-25 09:19:46 +00:00
Laurent Destailleur
ff6182f62f Fix a lot of bug in "source" field: 
- missing creation table
- autoselect when creating order from proposal
- do not show proposal as origin when creating proposal
- use code instead of id
- use label in english
Also renamed table demand_reason into input_reason to match other table input_method.
 2011-05-07 11:36:47 +00:00
Regis Houssin
67fe35e67b Fix: mutualize code, more simple 2011-05-06 18:27:18 +00:00
Philippe Grand
7576726a31 fix some issue to display in pdf 2011-04-27 14:36:09 +00:00
Philippe Grand
b8c149ac3b add source of demand for propal 2011-04-27 08:49:51 +00:00
Regis Houssin
bc3312aa3d Fix: problem if not defined 2011-04-26 21:45:25 +00:00
Regis Houssin
da0b70c145 Works on possibility to change customer when cloning (enable in propal) 
New: can send extra input in ajax dialog
 2011-04-25 10:10:34 +00:00
Regis Houssin
7b73576731 Fix: possibility to skip update total of special lines with no qty and unit price 2011-04-13 15:39:03 +00:00
Philippe Grand
80457eedf1 Fix : availability wasn't displayed 2011-04-12 17:55:42 +00:00
Regis Houssin
1c89213caf Fix: reorder the lines correctly 2011-04-11 09:00:13 +00:00
Regis Houssin
d567827f3e Fix: problem for view normal product/service 2011-04-11 07:56:58 +00:00
Regis Houssin
fba4111f44 Fix: do not update price with special product 9 2011-04-10 18:44:58 +00:00
Regis Houssin
a2902877ce Fix: uniformize code 2011-04-10 09:57:54 +00:00
Regis Houssin
caff474114 Fix: problem to clone proposals with fk_parent_line 2011-04-09 20:06:25 +00:00
Regis Houssin
ecd673399f Fix: correct reorder line with fk_parent_line 
Fix: problem with create order from proposals with fk_parent_line
 2011-04-09 15:59:45 +00:00
Regis Houssin
4351580f79 Works on hook module 2011-04-09 11:29:38 +00:00
Regis Houssin
da212ec4cc Works on hook 2011-04-08 14:16:44 +00:00
Regis Houssin
83cf657906 Fix: use PropalLigne class 
Works on hook
 2011-04-08 10:10:08 +00:00
Regis Houssin
8267dbd084 Fix: do not uptate total with special product line 2011-04-07 12:32:29 +00:00
Regis Houssin
72b863fb88 Fix: problem with trigger 2011-04-07 10:54:45 +00:00
Regis Houssin
c9c0a5e3be Fix: problem with trigger 2011-04-07 10:43:08 +00:00
Regis Houssin
914e4a4bf1 Fix: product lines with parent line better works 
Fix: add trigger LINEPROPAL_DELETE
 2011-04-07 10:18:41 +00:00
Laurent Destailleur
d52b8a2bb6 Fix: Error in creating propal 2011-04-06 17:22:25 +00:00
Philippe Grand
daaffd5f14 to answer to this query : 
http://www.dolibarr.fr/forum/12-howto--aide/20784-delais-de-livraison#24930
you can create a delivery type and add it to your propal
 2011-04-06 15:36:45 +00:00
Regis Houssin
2757038f1f Fix: compatibility with external module and hook 2011-04-06 07:32:54 +00:00
Regis Houssin
be7c268e8d Fix: add fk_parent_line for external module 2011-04-05 15:31:14 +00:00
Regis Houssin
49e120cfe2 Fix: rename table 2011-04-01 10:49:57 +00:00
Philippe Grand
0f584ef6a2 To answer to this query : 
http://www.dolibarr.fr/forum/12-howto--aide/20784-delais-de-livraison#24930
 2011-04-01 10:04:49 +00:00
Laurent Destailleur
e9f4879245 Qual: Prepare move of function dol_delete_file into file.lib.php 2011-03-09 15:34:57 +00:00
Laurent Destailleur
b2532440fb Doxygen 2011-03-08 11:12:57 +00:00
Regis Houssin
316e7a7d03 Fix: possibility to personnalized label of propal status 2011-03-03 18:40:20 +00:00
Regis Houssin
82ac23ba04 Fix: possibility to personnalized label of propal status 2011-03-03 18:33:24 +00:00
Laurent Destailleur
038727ee11 Fix: Missing property 2011-03-02 10:26:55 +00:00
Laurent Destailleur
49698b1c03 Fix: Remove sql error when no link 2011-03-01 09:34:23 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Regis Houssin
65f75f309e Fix: uniformize code 2011-01-15 09:31:09 +00:00
Regis Houssin
e371d6a021 Works on best mutualized code 
Works on MVC
 2010-12-13 19:59:05 +00:00
Laurent Destailleur
6846333ec8 New: Function dol_now('tzuser') is now supported. 2010-12-08 13:13:17 +00:00
Laurent Destailleur
77bb9b945c Fix: Use default proposal delay when cloning. 2010-11-16 21:05:52 +00:00
Laurent Destailleur
8bc3bae49e New: Add suppliers orders to process in dashboard 2010-11-13 17:37:22 +00:00
Laurent Destailleur
a40aed2c88 Fix: Error management 2010-11-11 22:15:54 +00:00
Regis Houssin
9be7a76047 Fix: empty local tax 2010-11-05 23:48:48 +00:00
Laurent Destailleur
49bd52c4ab Fix: Bad link 2010-11-04 19:05:05 +00:00
Laurent Destailleur
d9bc203c59 Doxygen 2010-10-27 22:41:40 +00:00
Laurent Destailleur
ad9c4c4217 Qual: Uniformize code (ligne -> line) 2010-10-27 14:37:27 +00:00
Laurent Destailleur
5b96527805 Qual: Uniformize code (ligne -> line) 2010-10-27 14:15:30 +00:00
Laurent Destailleur
0e663354f0 Fix: Preview was broken after renaming lignes into lines 2010-10-02 11:47:15 +00:00
Laurent Destailleur
51f7988bc2 Fix: Properties must be changed by valid function 2010-09-18 16:02:10 +00:00
Regis Houssin
da5f21a732 Works on module hook integration 2010-09-11 11:54:59 +00:00
Regis Houssin
156a1e6b29 Qual: uniformize code 2010-09-10 14:35:07 +00:00
Regis Houssin
5cbde19432 Works on module hook integration 2010-09-10 09:52:08 +00:00
Regis Houssin
548210a9e3 New: move "commande create from propal" in a trigger 2010-09-10 06:28:52 +00:00
Regis Houssin
23742344c8 New: move "commande create from propal" in a trigger 2010-09-10 06:28:51 +00:00
Regis Houssin
2e54c35898 Add trigger for propal create from clone 2010-09-09 17:57:37 +00:00
Regis Houssin
dcfcb1bc53 Works on module hook integration 2010-09-09 17:40:25 +00:00
Regis Houssin
97f4b62c80 Works on hook integration in pdf 2010-09-09 16:57:53 +00:00
Regis Houssin
015f32dd0d Works on hook integration in pdf 2010-09-09 15:24:06 +00:00
Regis Houssin
ff17dfd9c0 Add an example for hook integration in pdf 2010-09-09 07:26:17 +00:00
Regis Houssin
e27c4da39f Works on module hook integration 2010-09-08 09:38:17 +00:00
Regis Houssin
424a157ecf Fix: uniformize code 2010-09-07 14:36:00 +00:00
Regis Houssin
ad6999de3b Works on module hook integration 2010-09-07 14:02:10 +00:00
Regis Houssin
247809d2ce Works on module hook integration 2010-09-07 13:07:32 +00:00
Regis Houssin
f4e656eee1 Fix: regression 2010-09-06 22:31:36 +00:00
Laurent Destailleur
46546a78ab Fix: Restore all behaviour of order management of line. The new one is too complex and could not work as it is done. 2010-09-06 21:10:45 +00:00
Regis Houssin
63908863cc Works on migration management positioning lines 
Phase 4 : llx_expeditiondet et llx_livraisondet
 2010-09-06 16:39:38 +00:00
Regis Houssin
b9ba88a5d2 Works on migration management positioning lines 
Phase 4 : llx_expeditiondet et llx_livraisondet
 2010-09-06 16:31:28 +00:00
Regis Houssin
1288c620f2 Works on migration management positioning lines 
Phase 2 : llx_commandedet
 2010-09-06 13:44:19 +00:00
Regis Houssin
fbed8e2ceb Works on migration management positioning lines 
Phase 1 : llx_propaldet
 2010-09-06 12:58:02 +00:00
Regis Houssin
e04f0a3f9b Works on migration management positioning lines 
Phase 1 : llx_propaldet
 2010-09-06 10:35:56 +00:00
Laurent Destailleur
cb73e03168 Qual: Uniformize dictionnary table names. 2010-09-05 23:39:37 +00:00
Laurent Destailleur
a1f7c109cb Fix: Bad parameters order 2010-08-26 22:09:51 +00:00
Laurent Destailleur
fdc13a2480 Qual: Uniformize code 
Doc: Doxygen
 2010-08-18 07:28:12 +00:00
Regis Houssin
8a5f4866a8 Fix: possibility to defined rang with an external module 2010-08-17 14:54:46 +00:00
Regis Houssin
564326d5cd Fix: delete deprecated functions 2010-08-17 14:05:24 +00:00
Laurent Destailleur
5affcd3b3f Qual: Renamed french field "envente" into "tosell". 2010-08-11 18:35:31 +00:00
Laurent Destailleur
6d82aeda67 Fix: Database compatibility 2010-08-09 15:42:57 +00:00
Regis Houssin
aa62559812 Fix: fetch_client is deprecated 2010-08-06 13:56:25 +00:00
Laurent Destailleur
2db5b658f1 Fix: Some errors in vat management with multiprice 2010-07-22 21:16:29 +00:00
Laurent Destailleur
dbc4f53f7f Fix: Wrong W3C, error in filter. 2010-07-22 18:49:58 +00:00
Laurent Destailleur
87ce3073d5 Doxygen 2010-07-21 11:57:52 +00:00
Laurent Destailleur
ba2df8ac08 Fix: Works if country not defined 2010-07-18 09:36:10 +00:00
Laurent Destailleur
d2acbc35ec Fix: Fix a lot of bugs (missing translations, sql error, country flag not shown, region management, W3C, ajax too slow...) 2010-07-09 23:49:41 +00:00
Regis Houssin
f430b54cca Works on Milestone module 2010-07-02 15:38:32 +00:00
Regis Houssin
12fc4438ca Works on MVC model 2010-07-01 07:10:41 +00:00
Regis Houssin
1cddc25657 Fix: uniformize code, best way for optimizing code 2010-06-30 15:01:18 +00:00
Juanjo Menent
984ff2ddcf Local Taxes: Comments on function parameters 2010-06-22 08:07:23 +00:00
Juanjo Menent
8638fe142b Local Taxes: Works in Propals 2010-06-21 08:13:01 +00:00
Juanjo Menent
ba8896be48 Local Taxes: Works in Propals 2010-06-17 18:36:30 +00:00
Juanjo Menent
92a2be3ef3 Local Taxes: Works in Propals. ¡NOT FINISHED! 2010-06-17 17:12:34 +00:00
Regis Houssin
1dc875749c Works on delivery and billing address 
first step: rename llx_societe_adresse_livraison to llx_societe_address
 2010-05-29 10:14:51 +00:00
Regis Houssin
ff37e4286a Fix: prendre en compte les erreurs des triggers dans la fonction, ne pas faire de retour d'erreurs a partir du trigger pour ne pas les prendre en compte. 2010-05-28 08:30:39 +00:00
Laurent Destailleur
1a90eefb86 Fix: Head array hidden if nothing 2010-05-20 22:23:58 +00:00
Laurent Destailleur
f7e30a0a5b Qual: Removed pdate 2010-05-08 19:31:44 +00:00
Laurent Destailleur
89c76d13b2 Fix: Remove depracated property 
Qual: Removed pdate
 2010-05-08 19:21:57 +00:00
Regis Houssin
793f2a9246 Works on improvement for external module 2010-05-08 16:19:41 +00:00
Laurent Destailleur
a1ba46588e Qual: Mutualize code 2010-05-04 18:33:22 +00:00
Regis Houssin
2a37a9a2fa Fix: error with linked element 2010-04-30 06:57:28 +00:00
Regis Houssin
38701cda84 Fix: error with linked element 2010-04-30 06:57:28 +00:00
Regis Houssin
fe62fdcf68 Add a common function to delete the linked contact 2010-04-29 15:57:57 +00:00
Philippe Grand
16a8ab7d59 according to new tree directory 2010-04-29 14:54:12 +00:00
Philippe Grand
b65ddfabe8 according to new tree directory 2010-04-28 21:29:12 +00:00
Regis Houssin
e4ea54f315 Fix: move class to class directory 
Fix: mutualize code
 2010-04-28 17:30:59 +00:00