Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,702 Commits 36 Branches 189 Tags
b21fd14a114448f94e6fbabeae35cbc7ebe7e35c
Commit Graph

2413 Commits

Author SHA1 Message Date
Alexis Algoud
360c952e5a FIX column too small, header on 2 lines 2016-11-29 09:50:55 +01:00
Laurent Destailleur
ce10dc618c Merge pull request #6040 from atm-florian/DEV_thirpdarty_extrafields_export_on_contact 
FIX missing extrafields of thirdparty on contact export
 2016-11-27 15:20:14 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
florian HENRY
8ea49d8887 add extrafields thirdparty on contact export 2016-11-25 10:55:09 +01:00
Laurent Destailleur
5acd09b2d5 Fix require_once instead of require. 2016-11-24 17:03:18 +01:00
Laurent Destailleur
52fac193ad MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE does not works as it needs the add 
contact manually. Quick hack added to use the creator instead.
 2016-11-23 11:50:01 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
d197a0e0aa NEW Can create expense report for someone else (advanced permission) 
NEW Can clone an expense report
 2016-11-13 22:01:22 +01:00
Laurent Destailleur
ee14eab802 Multi devise 2016-11-13 18:47:10 +01:00
Laurent Destailleur
0f1b34f556 Fix code unreachable 2016-11-13 18:17:49 +01:00
Laurent Destailleur
fe1c83b206 Fix code not reachable 2016-11-13 18:15:31 +01:00
aspangaro
c65678d00a Update cactus numbering model 2016-11-11 07:36:26 +01:00
aspangaro
60219fa84d Update tulip model 2016-11-11 07:06:45 +01:00
Laurent Destailleur
52080fb917 Fix code not reachable 2016-11-08 20:06:50 +01:00
Laurent Destailleur
18d1878775 Debug accountancy module 2016-11-06 13:07:49 +01:00
BENKE Charlie
7be49e47b8 indenting and little refactoring 2016-11-01 17:09:51 +01:00
Laurent Destailleur
03b882d095 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:44:55 +02:00
Maxime Kohlhaas
be493fcf09 Fix bad parameter in hook call 2016-10-28 10:16:58 +02:00
Laurent Destailleur
27808b7f81 Merge pull request #5915 from aspangaro/5.0-p29 
NEW Expense report documents are now available in ECM module
 2016-10-26 10:57:23 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
phf
3e2f39fbc0 Fix on first activate module it must create if needed the first currency rate from general settings 2016-10-25 13:31:36 +02:00
aspangaro
d0544b0aea Merge remote-tracking branch 'Upstream/develop' into 5.0-p29 2016-10-24 05:27:49 +02:00
aspangaro
337e9db046 New: Expense report documents are now available in ECM module 2016-10-24 05:26:19 +02:00
Laurent Destailleur
ffcfe30529 FIX Avoid errors on debian 2016-10-22 16:51:54 +02:00
florian HENRY
5f3eb9097e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_resource_extrafields 2016-10-21 13:51:53 +02:00
Laurent Destailleur
c4dd689b08 Clean unreachable code 2016-10-21 11:53:41 +02:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2016-10-16 19:04:33 +02:00
Laurent Destailleur
2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php
 2016-10-16 19:02:36 +02:00
Laurent Destailleur
b51b6fa8c8 Merge pull request #5865 from atm-florian/develop 
NEW : Export thirdparty with payement terms and mode
 2016-10-15 02:18:07 +02:00
Laurent Destailleur
4fb66cf7a4 Better explanation for ftp module setup to avoid error with FTPS/SFTP. 2016-10-15 02:11:49 +02:00
Laurent Destailleur
78182ab504 Fix sepa mandate translation 2016-10-14 17:47:05 +02:00
florian HENRY
0b78f7f101 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-10-14 10:05:28 +02:00
Sergio Sanchis Climent
567f7e5365 FIX: #5340 2016-10-14 00:43:10 +02:00
Laurent Destailleur
7c1b74133a Debug accountancy module 2016-10-13 22:29:49 +02:00
florian HENRY
4e34b6e0c6 Merge remote-tracking branch 'origin/develop' into develop 2016-10-12 19:00:32 +02:00
florian HENRY
cc28391944 NEW : Export thirdparty with payement terms and mode 2016-10-12 18:59:34 +02:00
Laurent Destailleur
ba52eb870c Enhancement of Oauth module 2016-10-07 18:43:44 +02:00
Laurent Destailleur
03876ba637 Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right 
NEW : Reopen a paid bill is a user right
 2016-10-07 13:31:10 +02:00
Laurent Destailleur
c982409c72 Fix a deadlock feature 2016-10-06 15:29:10 +02:00
Laurent Destailleur
db3e3642b0 NEW Can generate SEPA mandate for each bank account of your customers 2016-10-06 00:14:25 +02:00
Laurent Destailleur
a192045be2 FIX PHPCS 2016-10-03 00:47:11 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
51df25509e Fix conflicts on default doc template when enabling/disabling modules 2016-10-02 20:00:57 +02:00
Laurent Destailleur
f92ca518f7 Uniformize look and feel 2016-10-02 16:38:58 +02:00
Laurent Destailleur
3efa0e411d NEW Add a direct debit mandate PDF template. 2016-10-02 15:29:43 +02:00
Laurent Destailleur
a52ad545eb Enhancement on module Direct Debit SEPA. 2016-10-02 13:03:45 +02:00