Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,690 Commits 36 Branches 189 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

1861 Commits

Author SHA1 Message Date
jean
82a2bb1690 list bof orders to process : status validated or in process, or closed 
but not billed
 2014-09-25 17:00:44 +02:00
Christophe Battarel
d1868b643e FIX: clone line extrafields value on quote, order and invoice 2014-09-24 11:47:34 +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
e97a84102b Fixed syntax error in commande document generation 2014-09-21 18:49:44 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
aspangaro
9da597d56e Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
Laurent Destailleur
2b602e7b5a Qual: Uniformize param names. contactidp -> contactid 2014-09-18 18:46:00 +02:00
Marcos García de La Fuente
c195c6fd10 Removed deprecated usage of commande_pdf_create 2014-09-16 20:35:31 +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
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
2dbbc76645 Fix: Trigger error not reported 2014-09-15 11:48:50 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +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
Frédéric FRANCE
c2701d735b Update liste.php 2014-09-07 11:31:59 +02:00
Laurent Destailleur
643fc6c61f Fix: Bad use of fetch_lines 
Conflicts:
	htdocs/comm/propal.php
	htdocs/contrat/fiche.php
	htdocs/opensurvey/class/opensurveysondage.class.php
 2014-09-04 19:03:48 +02:00
Laurent Destailleur
73ad0f9302 Fix: Bad use of fetch_lines 2014-09-04 18:58:33 +02:00
Laurent Destailleur
38233ca05d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/limits.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/core/ajax/ziptown.php
 2014-09-02 13:46:47 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
 2014-09-02 12:57:33 +02:00
Laurent Destailleur
ee65e42b1c The "final ref" of an object must be set only once all database actions 
are ok. So after trigger call.
If a trigger need to know new information on an object, trigger must
make a fetch on object.

Revert "Fix: define new ref before trigger"

This reverts commit cb2b6e6e40.
 2014-08-19 14:57:01 +02:00
Laurent Destailleur
a220634d30 Revert "Fix: define new ref before trigger" 
This reverts commit 6ab41766c8.
 2014-08-19 14:53:30 +02:00
Regis Houssin
6ab41766c8 Fix: define new ref before trigger 2014-08-18 20:34:55 +02:00
Regis Houssin
cb2b6e6e40 Fix: define new ref before trigger 2014-08-18 20:28:58 +02:00
Regis Houssin
9fdfc740de Fix: define new ref before trigger 2014-08-18 20:25:57 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
1751b58ef8 New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or 
content template.
 2014-08-06 00:46:00 +02:00
Maxime Kohlhaas
269a59e11a Fix : warning was not calculated on the right date 2014-08-05 14:17:29 +02:00
Laurent Destailleur
164c9e0b75 New: Can defined a bcc for each email type. 2014-08-05 09:28:58 +02:00
fmarcet
67a7a210fd Fix: Optimieze Price by Customer 2014-08-01 16:17:31 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
frederic34
6d5767e464 Merge remote branch 'upstream/develop' into selectdelivery 2014-07-28 20:15:40 +02:00
Laurent Léonard
0228cd9db7 Fix translations in e-mail forms 2014-07-28 02:45:58 +02:00
frederic34
0450498e2b Add restriction to combo box 2014-07-26 17:17:40 +02:00
frederic34
5258c522ce Some cleaning 2014-07-25 23:20:19 +02:00
frederic34
2df2c12cfd The delivery method is transmited in shipment 2014-07-25 21:50:21 +02:00
frederic34
4fcff3e2e5 Select delivery method for order 2014-07-25 17:20:42 +02:00
Marcos García de La Fuente
ac824728bc Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +02:00
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-07-15 23:30:15 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
KreizIT
8e64ea274d Refactor: ORDER_* and LINEORDER_* trigger 2014-07-11 14:02:21 +02:00
frederic34
387d36e4b0 Ste bank account for supplier order 2014-07-09 18:00:21 +02:00
frederic34
c8e6387e52 Merge remote branch 'upstream/develop' into selectbank 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-08 22:46:38 +02:00
Alexis Algoud
6d83882a5d FIX : Bad rank when a bill was made by multiple orders 2014-07-08 09:00:41 +02:00