Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

4492 Commits

Author SHA1 Message Date
Laurent Destailleur
2c730bf61c Merge pull request #2332 from aspangaro/3.7-patch1 
FIXED Review
 2015-02-08 00:03:11 +01:00
Laurent Destailleur
1776349a30 Merge pull request #2329 from atm-ph/deliverytime 
NEW Deliverytime
 2015-02-08 00:00:50 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:12:22 +01:00
aspangaro
63dd237b85 Typo 2015-02-07 15:21:30 +01:00
aspangaro
f23212eb22 Center title column & modify language key 2015-02-07 14:55:56 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
2f388949f6 Make a test with jsganttimproved 2015-02-07 03:11:35 +01:00
phf
35d41d6f7c [CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime). 2015-02-06 16:07:22 +01:00
phf
b31c77c754 [CORE] FIX : ajout d'une traduction manquante (#new_ask_price). 2015-02-06 09:50:59 +01:00
phf
bcbf29d9a5 [CORE] assainissement du code + traductions FR vers EN (#new_ask_price). 2015-02-04 15:39:57 +01:00
Laurent Destailleur
556c27f834 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/stock/mouvement.php
 2015-02-04 15:15:50 +01:00
Laurent Destailleur
01541e4152 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php
 2015-02-03 12:17:45 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
6e57e41fb0 Translation 2015-02-02 21:55:07 +01:00
Laurent Destailleur
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +01:00
Laurent Destailleur
5aecfa4cdb Translation 2015-02-02 21:44:40 +01:00
Laurent Destailleur
e4c5aa30be Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-01 01:44:01 +01:00
Laurent Destailleur
a43fcdbb14 Missing entries 2015-02-01 01:43:36 +01:00
Laurent Destailleur
6b27d8d44c Merge pull request #2298 from ndrosis/patch-16 
Correct view link
 2015-01-31 20:25:11 +01:00
Laurent Destailleur
324ded162d Merge pull request #2297 from ndrosis/patch-15 
translate UpdateServerOffline live last version
 2015-01-31 20:20:18 +01:00
Laurent Destailleur
d66d4f53a5 Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into 
frederic34-tooltip

Conflicts:
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/product/index.php
 2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
 2015-01-31 14:53:14 +01:00
Laurent Destailleur
770ddb6b0f Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-task-1793

Conflicts:
	ChangeLog
	htdocs/margin/lib/margins.lib.php
 2015-01-31 14:29:15 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
43702cf662 New: Enhance stock management: Introduce tag to define if a subproduct 
must have stock decreased and add inventory code on stock movements.
 2015-01-30 01:51:28 +01:00
Drosis Nikos
f86db9d686 Correct view link 2015-01-28 23:55:12 +02:00
Drosis Nikos
831bc5393d translate UpdateServerOffline live last version 2015-01-28 23:17:46 +02:00
Laurent Destailleur
14be79d3e8 Better help 
Bad var
 2015-01-28 20:04:18 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration. 
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
 2015-01-25 22:29:36 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission 
Fixed error management
Fixed rendering country must be same for all tabs.
 2015-01-25 00:59:46 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
Laurent Destailleur
568d5cb5ba Fixed: Tracking number restored on PDF shipments 
Fixed: Translation

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-01-23 18:47:47 +01:00
Laurent Destailleur
083cf06908 Fixed: Tracking number restored on PDF shipments 
Fixed: Translation
 2015-01-23 18:33:33 +01:00
Laurent Destailleur
017a483eb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-21 00:06:03 +01:00
Laurent Destailleur
449f2b9346 Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-delay-emailing

Conflicts:
	htdocs/comm/mailing/card.php
 2015-01-21 00:05:19 +01:00
Florian HENRY
ab50437331 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/html.form.class.php
 2015-01-19 09:38:00 +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
Marcos García de La Fuente
c667f8734a [ task #1793 ] Create new permission to restrict commercial agent margin to logged user 2015-01-18 16:42:11 +01:00
Marcos García de La Fuente
fb186d6ef8 Added delay between mails in Newsletter module 2015-01-18 16:26:26 +01:00
Florian HENRY
22c253cfc1 add extrafield type, check box from table 2015-01-18 16:02:31 +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
Florian HENRY
b407716175 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-18 11:57:32 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
d1a0187f82 Merge pull request #2236 from marcosgdf/translations 
Corrected translation typos
 2015-01-16 12:10:32 +01:00
Laurent Destailleur
6a081fe883 Merge pull request #2229 from frederic34/getnextvalue 
Translation error messages numbering modules
 2015-01-16 12:08:53 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00