Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
46,411 Commits 36 Branches 189 Tags
426835781a68fedd05f06cb8a2a8bececcd4e7dc
Commit Graph

993 Commits

Author SHA1 Message Date
Laurent Destailleur
e8e2f65ae5 Debug virtual product interface 2015-03-11 14:55:45 +01:00
Laurent Destailleur
548e720ca2 Uniformize code 2015-03-10 19:31:04 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Laurent Destailleur
73afe1513d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/index.php
 2015-03-02 03:07:19 +01:00
Laurent Destailleur
3475433eaf Fix: the bank information were visible into pdf but were not using 
correct setup to decide which bank to show.
 2015-03-02 02:59:59 +01:00
Laurent Destailleur
8e26c71fa7 Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
phf
c459794999 [CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm). 2015-02-23 10:36:44 +01:00
phf
81130634d3 [CORE] intégration de incoterm sur les différentes class (#incoterm). 2015-02-23 09:16:14 +01:00
phf
560d836943 [CORE] corrections mineurs sur des tests (#incoterm). 2015-02-10 12:21:29 +01:00
phf
36304234d2 [CORE] ajout de l'incoterm sur les pages propal et à l'objet (#incoterm). 2015-02-10 11:46:35 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
Laurent Destailleur
275e198041 New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
Laurent Destailleur
59711298c3 Fixed: Length of project label is no more truncated on element cards 
(invoice, proposal, order...)
 2015-01-30 16:33:39 +01:00
phf
903f739449 [CORE] avancement du mercredi matin (#new_ask_price). 2015-01-28 10:33:15 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now 
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
 2015-01-25 21:32:40 +01:00
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
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Laurent Destailleur
34fe87536b Merge pull request #2137 from frederic34/printipp 
Printing System which may accept modules
 2015-01-18 13:09:41 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +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
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
frederic34
e937039596 Merge remote branch 'upstream/develop' into printipp 2014-12-28 11:59:58 +01:00
Christophe Battarel
1ab6955494 FIX: dont remove price ht if it is forced (ie: calculated by margin rate 
and cost price, or by external module)
 2014-12-27 11:27:41 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
aec1bdb3c4 Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
Laurent Destailleur
bd7f6339ce Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-25 12:08:35 +01:00
Laurent Destailleur
9e2f57007b Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-23 12:59:54 +01:00
Laurent Destailleur
acf7b9f130 Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-23 12:59:34 +01:00
Frédéric FRANCE
6f4ba2552d Typo on conf variable 2014-12-21 10:14:51 +01:00
frederic34
295fe115ab Merge remote branch 'upstream/develop' into printipp 2014-12-08 20:33:50 +01:00
frederic34
5cce8c45e3 WIP PrintIPP 2014-12-05 18:23:54 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
81f467661e Update propal.php 2014-11-24 20:58:46 +01:00
Laurent Destailleur
737dfab5b2 Fix: If error on add line of type "product" when creating 
proposal/order/invoice, do not show date of services.
 2014-11-16 19:12:05 +01:00
Laurent Destailleur
0a0dd81c9a Fix: When selecting a carbon copy fro select list, mail was not attached 
to user.
 2014-11-04 13:54:18 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
2b08417b77 Fix: [ bug #1612 ] Adding free product line line with negative qty in 
credit notes, doesn't give error message
 2014-10-27 01:51:33 +01:00