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

2061 Commits

Author SHA1 Message Date
Laurent Destailleur
208ac31bf8 Fix test for es 2015-04-22 17:39:09 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Laurent Destailleur
e476b57795 Merge pull request #2678 from defrance69/patch-60 
add tab management on salarie payement
 2015-04-21 11:15:20 +02:00
Marcos García de La Fuente
2967bc7df7 Merge branch 'develop' into units 2015-04-19 17:19:59 +02:00
BENKE Charlie
5a68cba013 Create salaries.lib.php 
add lib salaries for menu management
 2015-04-19 13:25:43 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
270bca740c Merge branch 'develop' into units 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
 2015-04-19 00:59:04 +02:00
Maxime Kohlhaas
ee8b5be43b Typo 2015-04-19 00:46:30 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
jfefe
3825b89ead Change companies and product title picto 2015-04-18 23:13:48 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Juanjo Menent
c5d8fa4602 Fix: solves #2644 2015-04-18 19:14:30 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Maxime Kohlhaas
7aba52c810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 10:29:43 +02:00
Laurent Destailleur
deb62f1ffd Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/expedition/list.php
 2015-04-18 04:18:59 +02:00
Maxime Kohlhaas
e6c5b234fc Remove debug trace 2015-04-18 03:54:33 +02:00
Laurent Destailleur
a034cda6ac Better test 2015-04-17 22:48:39 +02:00
Laurent Destailleur
b8736b0a6f Merge pull request #2457 from accett/patch-5 
Update functionsnumtoword.lib.php
 2015-04-17 22:42:19 +02:00
Florian HENRY
32e067c806 Remove debug 2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74 Fix doliforge bug 1707 2015-04-15 18:53:39 +02:00
Laurent Destailleur
bf254baa02 Fix doliforge bug 1707 2015-04-15 18:50:41 +02:00
Laurent Destailleur
8511f1f7ef Fix the data-role parameter 2015-04-15 18:14:26 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
Laurent Destailleur
503a4ff7a0 Enhance filtering for bank transaction and timesheet. 2015-04-09 20:40:49 +02:00
Laurent Destailleur
3ee2790737 Always sho project info when opening task card 2015-04-09 16:26:21 +02:00
braito4
914b324a67 minor bug drag and drop total line in tasks list 2015-04-09 10:37:54 +02:00
Laurent Destailleur
1bbecc0912 Restore link to stock for products. 2015-04-08 19:26:36 +02:00
Frédéric FRANCE
0dc7bc0ddb Add badge 2015-04-07 12:54:10 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Laurent Destailleur
ad50810c7a Fix deprecated code 2015-04-07 02:48:19 +02:00
Laurent Destailleur
493392d89f Remove warnings 2015-04-06 19:46:10 +02:00
Laurent Destailleur
c148f82452 Fix warning 2015-04-06 19:31:25 +02:00
Laurent Destailleur
3d161deb17 Fix more robust function 2015-04-06 16:50:26 +02:00
Laurent Destailleur
b49705d5d0 Status and amount of object should always be visible. 2015-04-06 16:13:23 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00:00
Laurent Destailleur
2ec5595277 NEW Can install an external module from admin pages, if web server has 
permission for and if setup is ok for.
 2015-04-04 00:19:03 +02:00
Laurent Destailleur
106a393054 NEW Add function dolCopyDir to copy directory with recursive content. 2015-04-03 23:42:56 +02:00
Laurent Destailleur
afecab3f39 Better error management for dol_uncompress 2015-04-03 18:42:07 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Laurent Destailleur
d8bec2fb59 Merge pull request #2507 from frederic34/doc4contact 
Add document tab for contact
 2015-04-02 11:41:35 +02:00
Laurent Destailleur
051f3474c4 Merge pull request #2512 from frederic34/patch-9 
Add badge
 2015-04-02 11:25:06 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
c71efc8f2e Avoid pb with scrutinizer 2015-03-31 16:59:40 +02:00
Frédéric FRANCE
2a34ec9db1 Add badge 2015-03-31 16:26:32 +02:00
frederic34
fe6227e93f Typo 2015-03-31 08:45:36 +02:00
frederic34
bab04258e0 Add document tab for contact 2015-03-30 18:15:29 +02:00
Frédéric FRANCE
bcd7516e25 Fix for donation.lib.php 2015-03-29 18:22:45 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor 
refactor
 2015-03-29 16:17:36 +02:00