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

349 Commits

Author SHA1 Message Date
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Laurent Destailleur
908a95d83f Merge pull request #2211 from marcosgdf/contract-fixes 
Several Contract-related fixes
 2015-01-06 00:18:51 +01:00
Laurent Destailleur
d8d01090cd Fixed: Mark function as deprecated 2015-01-04 19:28:05 +01:00
Marcos García de La Fuente
2202380bc2 Improving ContratLigne documentation 2014-12-28 19:36:43 +01:00
Marcos García de La Fuente
7424ee1107 Improving Contrat documentation and fixed some properties usage 2014-12-28 19:28:25 +01:00
Marcos García de La Fuente
ef4d710f78 Improving CommonObject and Contrat documentation 2014-12-28 19:16:14 +01:00
Marcos García de La Fuente
ec7bc21e4c Fixed undefined variable $pu_ht 2014-12-28 19:01:39 +01:00
Marcos García de La Fuente
0b4bddd738 Fix [ bug #1779 ] Undefined variable $localtaxtx1 and $localtaxtx2 in Contrat::updateline 2014-12-28 18:57:59 +01:00
Marcos García de La Fuente
52b8bb350e Fixed Contrat::fetch not setting Contrat::date_creation and improved class doc 2014-12-28 18:10:30 +01:00
Marcos García de La Fuente
cd468b65fd Documented Contrat class 2014-12-28 17:55:21 +01:00
Laurent Destailleur
e70b6714ce Doxygen 
(cherry picked from commit 613d1b3)
 2014-12-28 17:50:38 +01:00
Marcos García de La Fuente
584be6a589 Fixed Contrat::fetch 2014-12-28 17:47:13 +01:00
Laurent Destailleur
613d1b381b Doxygen 2014-12-27 01:10:42 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
79c8980493 Fix: function at wrong place 2014-11-28 01:13:57 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Regis Houssin
3ddcac5ced Fix: missing $ismultientitymanaged 2014-10-06 09:12:19 +02:00
Regis Houssin
692881bf59 Fix: missing $ismultientitymanaged 2014-10-06 09:07:09 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Regis Houssin
4124ee6bc4 Fix: add model_pdf in fetch of contract object 2014-09-29 10:28:10 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
Florian HENRY
14ca936cfc set ref_supplier for contract field 2014-09-24 10:21:26 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +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
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
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
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use 
dol_delete_recursive
 2014-08-13 12:42:55 +02:00
Florian HENRY
db7478098a Add a real free numbering module for contract 2014-08-12 13:26:06 +02:00
Florian HENRY
eca9408c91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-08-12 12:37:31 +02:00
Florian HENRY
cf63f1a40d Remane contract ref_ext to ref_supplier 2014-07-21 08:36:59 +02:00
Laurent Destailleur
109ccf9b74 Fix: SQL syntax error with pgsql 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2014-07-19 22:40:53 +02:00
Laurent Destailleur
8156b1400b Fix: SQL syntax error with pgsql 2014-07-19 20:45:02 +02:00
Florian HENRY
d0cc935cd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-12 10:16:08 +02:00
KreizIT
9c2aaf7d23 [ Task #1495 ] Add trigger LINECONTRACT_CREATE 2014-07-12 00:27:33 +02:00
Florian HENRY
d2e17eb321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-07-11 16:09:01 +02:00
Florian HENRY
14e3aa8a02 Allow trigger call on update line (class ContratLine must extends 
CommonObject to have method call_trigger)
 2014-07-11 11:32:27 +02:00
Florian HENRY
c7d31f4570 [ task #1204 ] Add ref_int contract field 2014-07-11 11:26:54 +02:00
Laurent Destailleur
4dbc1dd1c6 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-06 21:09:10 +02:00
Florian HENRY
02574a7af2 Fix Ajax combobox in Extrafeilds 
Add Extrafield on contract
 2014-07-05 11:17:50 +02:00
Laurent Destailleur
8e2999f73f Fix: phpcs 2014-07-04 14:19:03 +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
a432e57b12 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with 
contracts
 2014-07-04 11:45:40 +02:00
KreizIT
f0323e5b80 FIX: Contract's trigger problem 2014-07-03 15:21:43 +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
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +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
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
guerinaxel
944e582c82 Missing include contrat.class.php 
Missing include for function calcul_price_total.
 2014-05-14 14:17:15 +02:00
guerinaxel
4fc818d329 Correcting var name 
Correcting var name for contrat updateline
 2014-05-14 11:56:30 +02:00
guerinaxel
e0a3e79dda Correcting var name 
Correcting var name for contrat updateline
 2014-05-14 10:23:03 +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
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +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
748d769140 Fix: [ bug #1280 ] service with not end of date was tagged as expired. 2014-03-02 15:50:26 +01:00
Christophe Battarel
66db46a693 Fix: default ref was DOLIBARR instead of SPECIMEN, so specimen generation did not work and crashed dolibarr 2014-02-26 15:57:43 +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
Florian Henry
5f8e896e0c Fix [ bug #1154 ] Error when closing a service in a contract (pgsql) 2013-11-27 22:58:49 +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
Laurent Destailleur
e5bc7d29d0 Fix: Validation of contract lose the new ref into trigger. 
Fix: Validation of contract was not using transaction
Fix: Validation of contract did not renamed uploaded directory.
 2013-10-18 10:17:06 +02:00
simnandez
002e248f00 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:55:49 +02:00
Laurent Destailleur
92e1536d8f Fix: checkstyle errors 2013-09-11 09:56:20 +02:00
simnandez
418457e945 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-11 09:19:25 +02:00
Grand Philippe
ed31c83fbb some fix for contract model 2013-08-26 15:42:01 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
BENKE Charles
20d1a89c07 Update contrat.class.php 
Add get_element_list function for return list of element (intervention linked to the contract)
 2013-05-28 10:05:49 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Grand Philippe
7f27801c3c fix: Undefined property: stdClass::$xxx 2013-05-01 09:41:36 +02:00
Laurent Destailleur
b3e2050186 Fix: Remove warning 2013-04-23 23:44:49 +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
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
simnandez
a811121daf [ task #731 ] Uniformize ref generation 2013-03-02 16:50:36 +01:00
Laurent Destailleur
2dce0c68e8 Merge pull request #652 from cbattarel/3.3 
3.3 : fix bug in contract update line (wrong vat variable name)
 2013-02-13 05:56:09 -08:00
Christophe Battarel
c6b263c586 fix bug in contract update line (wrong vat variable name) 2013-02-13 09:53:26 +01:00
Christophe Battarel
44134dec57 prepare contract class for margin management 2013-02-13 09:50:08 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
ca2b3f11b1 Fix: Several fix in trigger names 2012-12-30 12:24:53 +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
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
Laurent Destailleur
c247c710ec Qual: Uniformize code 2012-08-05 15:00:24 +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
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
af38a2fab7 Fix: bad parameters, use global 2012-06-10 10:29:43 +02:00
Regis Houssin
b51cd362b0 Fix: problem with external modules and uniformize code 2012-06-09 18:40:36 +02:00
Regis Houssin
1b350fafd1 Fix: missing entity field in contract 
Fix: multicompany compatibility
 2012-05-03 18:42:46 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Laurent Destailleur
317abb46fd Fix: Start war bug 2012-04-07 02:24:32 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +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
d752e25946 New: add new notes system in contract and order/invoice supplier module 2012-03-18 11:13:01 +01:00
Laurent Destailleur
0a17345415 Doxygen 2012-02-16 18:39:22 +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
66ccb8c679 First change to prepare usage of native PHP functions for date instead 2012-02-06 05:31:19 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
915bc47a58 Doxygen 2012-01-04 21:47:40 +01:00
Laurent Destailleur
ebea7f6c97 Fix: fix not initialized variables 2011-12-05 18:36:54 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +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
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
551e1f81bf Fix: Space after closing parenthesis of function call prohibited 2011-09-20 13:32:16 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
e00eb762f4 Look: Uniformize code and array presentation 
Doc: Doxygen
 2011-08-08 14:25:44 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
d8957b7da4 Bad log 2011-05-03 18:13:07 +00:00
Laurent Destailleur
d000ca1753 Fix: Avoid duplicate lines when fetch_lines called twice 2011-05-01 21:35:01 +00:00
Laurent Destailleur
8d3b0d4470 Doxygen 2011-03-08 11:21:39 +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
Laurent Destailleur
8fd2f8a577 Define a default module is not defined 2011-02-20 22:53:59 +00:00
Juanjo Menent
422b111ea3 Task #10577: Works with contracts 2011-02-18 19:55:48 +00:00
Regis Houssin
502bb75d2c Fix: uniformize code 2010-12-15 07:12:28 +00:00
Laurent Destailleur
2498426867 Fix: Restore stable version for 3.0 2010-12-14 23:27:17 +00:00
Regis Houssin
9d46536909 Fix: uniformize code 2010-12-14 15:04:56 +00:00
Laurent Destailleur
8bc3bae49e New: Add suppliers orders to process in dashboard 2010-11-13 17:37:22 +00:00
Laurent Destailleur
bb668c898c Fix: Wrong status for contracts 2010-11-01 14:35:17 +00:00
Regis Houssin
156a1e6b29 Qual: uniformize code 2010-09-10 14:35:07 +00:00
Philippe Grand
fb06c15330 task #6689, strlen problem 
replace  strlen with dol_strlen
 2010-08-24 14:42:18 +00:00
Laurent Destailleur
5affcd3b3f Qual: Renamed french field "envente" into "tosell". 2010-08-11 18:35:31 +00:00
Philippe Grand
1acf59bfd3 correct file adress 
small spelling changes
 2010-06-22 13:14:23 +00:00
Juanjo Menent
7dac107cd7 Local Taxes: Works in Contracts 2010-06-22 10:42:37 +00:00
Juanjo Menent
ca124a1476 Local Taxes: Works in Invoices. 
Contracts: Patch to invoicing with the new invoices changes.
Trad: Orders: Tab Compta.
 2010-06-21 16:49:41 +00:00
Regis Houssin
fe62fdcf68 Add a common function to delete the linked contact 2010-04-29 15:57:57 +00:00
Philippe Grand
b65ddfabe8 according to new tree directory 2010-04-28 21:29:12 +00:00
Philippe Grand
b6bc9223df according to new tree directory 2010-04-28 10:33:16 +00:00
Philippe Grand
b68a359265 according to new tree directory 2010-04-28 10:02:54 +00:00
Philippe Grand
faf19c91ae according to new tree directory 2010-04-28 08:35:57 +00:00