Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
57,789 Commits 36 Branches 189 Tags
775cd8ca7d3922efeebf3e5e6e4f3bc09d28f2d4
Commit Graph

57789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
775cd8ca7d Merge pull request #6391 from ParisLiakos/develop 
Wrong trigger when setting supplier invoice back to draft
 2017-02-08 10:55:42 +01:00
Laurent Destailleur
c4b95e6509 Merge pull request #6395 from atm-florian/develop 
Fix travis for php 7
 2017-02-08 09:58:54 +01:00
florian HENRY
7fcf598c78 Fix travis 2017-02-08 08:52:58 +01:00
Paris Liakos
9a141f8556 Wrong trigger when setting supplier invoice back to draft 2017-02-07 20:55:40 +02:00
Laurent Destailleur
e58743ea5b Fix regression: Textarea to enter data was crushed. 2017-02-07 01:13:04 +01:00
Laurent Destailleur
aa573b6dba git push origin developMerge branch 'atm-geoffrey-new_link_weather_board' into develop 2017-02-06 20:52:09 +01:00
Laurent Destailleur
ce067f9130 Merge branch 'new_link_weather_board' of 
https://github.com/atm-geoffrey/dolibarr into
atm-geoffrey-new_link_weather_board

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/index.php
 2017-02-06 20:51:46 +01:00
Laurent Destailleur
fcbc12ce31 Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project 
New link movement stock to project
 2017-02-06 20:45:04 +01:00
Laurent Destailleur
aa1c14e508 Remove change of PMP when we should not 2017-02-06 20:43:44 +01:00
Laurent Destailleur
b3e6b95714 Merge pull request #6377 from marcosgdf/fr-2763 
NEW #2763 Go to document block after clicking in Generate document button
 2017-02-06 20:38:36 +01:00
Laurent Destailleur
8f52a34e71 Report of supplier payment is name "supplier_payments" 2017-02-06 20:37:42 +01:00
Laurent Destailleur
a4bbcd866b Merge pull request #6372 from atm-arnaud/NEW_supplier_paiements_report 
NEW Add supplier paiements report
 2017-02-06 20:29:42 +01:00
Laurent Destailleur
d230883638 Merge pull request #6367 from gnovaro/patch-2 
Code style
 2017-02-06 20:25:16 +01:00
Laurent Destailleur
74992ee53f Merge pull request #6375 from marcosgdf/admin-view 
Little improvements to admin pages where a FREE_TEXT or a watermark constant was set
 2017-02-06 20:11:22 +01:00
Laurent Destailleur
9220a638b5 NEW Filechecker can include custom dir and report added files. 2017-02-06 15:29:07 +01:00
Laurent Destailleur
a673afe601 NEW Description of feature of a module into a dedicated popup 2017-02-04 14:16:17 +01:00
Laurent Destailleur
f9c510f4fb More complete translation 2017-02-04 11:34:29 +01:00
Laurent Destailleur
6450154553 Removed useless table-tr-td 2017-02-04 11:32:26 +01:00
Laurent Destailleur
f75bd1ac44 Doxygen for javascript functions file. 2017-02-04 11:02:10 +01:00
Marcos García de La Fuente
62a0c5be73 Little correction 2017-02-03 20:12:26 +01:00
Marcos García de La Fuente
2dfced366e NEW #2763 Go to document block after clicking in Generate document button 
Close #2763
 2017-02-03 20:11:06 +01:00
Marcos García de La Fuente
a94a951a89 Little improvements to admin pages where a FREE_TEXT or a watermark constant was set 2017-02-03 19:38:33 +01:00
Laurent Destailleur
d03f804025 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 17:00:51 +01:00
Laurent Destailleur
517a20db35 Update screenshot 2017-02-03 16:59:35 +01:00
arnaud
7f6ab748c5 NEW add rapport file for supplier paiement 2017-02-03 16:42:06 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +01:00
Laurent Destailleur
10353d1e1a Merge pull request #6370 from defrance/patch-72 
FIX : $resaction not used in all case in hookmanager
 2017-02-03 16:09:19 +01:00
Laurent Destailleur
3a649590f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 16:02:54 +01:00
Laurent Destailleur
ffedf1fd57 New demo page 2017-02-03 16:02:37 +01:00
Laurent Destailleur
1dd62c7daf New demo page 2017-02-03 16:01:06 +01:00
Laurent Destailleur
e232a5a444 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:36:05 +01:00
Laurent Destailleur
bda915c63a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:34:59 +01:00
Laurent Destailleur
a0251a262a The demo has its own CSS file. 2017-02-03 15:34:09 +01:00
Laurent Destailleur
5381eadc75 Fix translation 2017-02-03 15:33:44 +01:00
Laurent Destailleur
bd812a0bef NEW new demo entry page 2017-02-03 14:48:16 +01:00
Laurent Destailleur
bc43a052f4 Default usage to send token is header. 2017-02-03 12:16:13 +01:00
BENKE Charlie
3f236b1ebf FIX : $resaction not used in all case 
Please integrate on next 5.0
 2017-02-03 12:14:29 +01:00
Laurent Destailleur
53661e1e4f Merge pull request #6211 from GPCsolutions/optimizetranslate 
[Qual] Optimize language file loading
 2017-02-03 11:55:29 +01:00
Laurent Destailleur
9d3c774163 Merge pull request #6364 from atm-ph/new_trigger_in_expensereport_class 
NEW add triggers for expensereport object
 2017-02-03 11:46:59 +01:00
Laurent Destailleur
3dea950c24 Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project 
New htmlid can be use instead of htmlname for select projects
 2017-02-03 11:44:54 +01:00
Laurent Destailleur
76280f8ae2 Fix #6365 2017-02-03 11:42:49 +01:00
Laurent Destailleur
d740bdbc73 Fix #6365 2017-02-03 11:38:09 +01:00
Laurent Destailleur
bdca134e99 NEW Change to allow a specific numbering rule for invoice with POS 
module.
 2017-02-02 23:49:17 +01:00
Laurent Destailleur
a42ad74a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 23:22:34 +01:00
Laurent Destailleur
b4c97e2279 Update pad files 2017-02-02 23:14:51 +01:00
Gustavo Novaro
f815d1bed3 Code style 2017-02-02 17:30:06 -03:00
atm-ph
ac20a1a874 Fix remove param htmlid in ajax_combobox 2017-02-02 20:47:45 +01:00
phf
f2fdee0ed2 New add trigger for expensereport object 2017-02-02 11:42:38 +01:00
Laurent Destailleur
b5ca8ebef9 FIX #6316 2017-02-02 03:07:40 +01:00
Laurent Destailleur
4d78e0d45c FIX #6315 2017-02-02 02:53:32 +01:00