Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Laurent Destailleur
01fbee0e06
Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr
...
into aspangaro-develop-patch34
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2015-06-19 11:27:15 +02:00
Laurent Destailleur
44d4d23c00
Fix phpcs
2015-06-19 11:21:36 +02:00
aspangaro
0c01295016
Fix travis
2015-06-19 06:19:10 +02:00
Laurent Destailleur
d3549cc2a0
Merge branch 'add_clone_on_event_agenda' of
...
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-add_clone_on_event_agenda
Conflicts:
htdocs/langs/en_US/agenda.lang
2015-06-16 11:41:45 +02:00
Raphaël Doursenaud
2629e47f77
Fix #3001 : the current code needs an array, not an object
2015-06-10 18:45:10 +02:00
Gauthier
dd81d3a762
NEW : add all assigned users and all extrafields data in new event when we createFromClone
2015-06-08 15:06:43 +02:00
Gauthier
053cfac262
NEW : clone action on agenda events
2015-06-08 12:39:25 +02:00
Raphaël Doursenaud
ea798c2315
Qual: deprecate dol_json_encode() and dol_json_decode()
...
PHP > 5.3 supports json_encode() and json_decode() natively
2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
49f2157f2d
Little debug of module resource
2015-05-31 02:05:39 +02:00
Laurent Destailleur
5e773d4cb6
Work on finishing of style
2015-05-31 01:06:51 +02:00
Gauthier
a707d40251
FIX : when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status
2015-05-29 14:32:50 +02:00
aspangaro
e23459d53b
NEW Forms are using the tab look, even in creation mode
2015-05-20 21:50:38 +02:00
tysauron
572269bed1
For backward compatibility ON update actioncomm
...
For backward compatibility when val=id ON update actioncomm object
2015-05-19 15:54:08 +02:00
Laurent Destailleur
c89c883d7d
Fix the new navigation style.
2015-05-17 19:37:37 +02:00
Laurent Destailleur
4408648a68
Merge pull request #2817 from GPCsolutions/jqueryfixes
...
jQuery fixes
2015-05-12 22:36:12 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
e149d49fb8
[Qual] Use jQuery property instead of attribute to test and set disabled
2015-05-12 14:53:01 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
Laurent Destailleur
414404e854
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/class/commonobject.class.php
2015-04-26 16:30:33 +02:00
Laurent Destailleur
13b4d86064
Better fix for #2709
2015-04-24 21:29:02 +02:00
Laurent Destailleur
d925e552ca
Merge pull request #2709 from atm-alexis/3.7
...
FIX event not linked to contact on creation
2015-04-24 21:23:50 +02:00
Alexis Algoud
7d3482036d
FIX event not linked to contact on creation
2015-04-24 17:40:53 +02:00
Gauthier
58008cef94
NEW : display linked object in edit mode when we create an event from an order, propal...
2015-04-23 16:28:29 +02:00
Laurent Destailleur
0e141f2c1b
Fix css
2015-04-23 15:35:32 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
2627662f5c
fix value ust be a string
2015-04-06 11:36:31 +02:00
Juanjo Menent
4588b2bb4c
Merge pull request #2517 from frederic34/patch-12
...
Closes #2509 Bug: Ref is not shown in the bubble that appears when the mouse is over an agenda link
2015-04-02 00:56:42 +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
16a620f926
Fix: Deadlock situation (when order were canceled, no way to make
...
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Frédéric FRANCE
08e7cb2e84
Correction for tooltip
2015-03-31 21:57:48 +02:00
Frédéric FRANCE
f0ed848609
Update actioncomm.class.php
2015-03-31 21:38:38 +02:00
Frédéric FRANCE
9ee6fdd163
Tooltip of actioncomm show empty ref
2015-03-31 21:07:17 +02:00
Florian HENRY
26c29216d9
syntax
2015-03-26 16:55:13 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Laurent Destailleur
687e3d250b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/fixdosfiles.sh
htdocs/core/tpl/objectline_edit.tpl.php
2015-03-13 17:46:31 +01:00
Laurent Destailleur
895b2c6e9c
Fix bad merge
2015-03-13 14:37:27 +01:00
Laurent Destailleur
a5645b626c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
0ff2a0ad9f
Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1825-37
Conflicts:
htdocs/comm/action/index.php
2015-03-11 02:26:01 +01:00
Laurent Destailleur
78f971f3e1
Merge remote-tracking branch 'origin/3.7' into develop
2015-03-05 11:46:48 +01:00
Laurent Destailleur
9c12c325db
Fix regression into enable/disable external calendars
2015-03-05 11:46:03 +01:00
Laurent Destailleur
d119397129
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-05 11:38:16 +01:00
Laurent Destailleur
6c1c1fd691
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/agenda.lib.php
htdocs/fourn/paiement/fiche.php
2015-03-05 11:35:39 +01:00
Marcos García de La Fuente
c9b3cab22b
Mytasks is not clickable
2015-03-05 10:22:33 +01:00
