Laurent Destailleur
aa380f6ee0
fix bad include
2015-02-16 20:43:39 +01:00
Laurent Destailleur
213c818204
Debug serial/lot management
2015-02-16 20:14:16 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
phf
24a970a109
[CORE] ajout de la gestion incoterm sur les pages commande et à l'objet (#incoterm).
2015-02-10 12:22: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
f52769b586
Merge pull request #2296 from frederic34/patch-5
...
Speed up listing with Is Order Shippable icon
2015-01-31 20:19:57 +01:00
frederic34
c1943f989b
Tooltip
2015-01-31 10:58:03 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
29d399ba79
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 00:09:37 +01:00
Laurent Destailleur
0ea4a5db7d
Fixed: Error management on triggers
2015-01-31 00:08:45 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +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
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Frédéric FRANCE
355c5f0b52
Update list.php
2015-01-28 21:32:23 +01:00
Frédéric FRANCE
3403979ed7
Speed up listing with Is Order Shippable icon
2015-01-28 21:27:07 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
frederic34
12c8d4ba1f
Merge remote branch 'upstream/develop' into tooltip
2015-01-22 00:44:50 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Frédéric FRANCE
0a41a025ae
Update index.php
2015-01-19 20:35:29 +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
Laurent Destailleur
7c5927ef93
Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1796
Conflicts:
ChangeLog
2015-01-18 15:08:49 +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
Marcos García de La Fuente
7f59cf9194
Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
41e01a22a3
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
2015-01-17 18:58:05 +01:00
Laurent Destailleur
be4c5cf9d3
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-10 01:16:31 +01:00
Laurent Destailleur
30d1284379
Fixed: Missing ref_ext
2015-01-10 01:15:39 +01:00
Laurent Destailleur
cd2a9d0e09
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-10 01:07:55 +01:00
Laurent Destailleur
87f70f2d22
Fixed: property must be called billed into web service.
...
Fixed: web service to create order was useless. it was not possible to
change status.
2015-01-10 01:07:18 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Laurent Destailleur
dbcaeb01c0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
2015-01-09 22:40:45 +01:00
Laurent Destailleur
068ae7f0d4
- Fix: ref_ext was not saved when recording a customer order from web
...
service
2015-01-09 22:32:00 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Laurent Destailleur
033757aafd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-01-06 00:33:28 +01:00
Laurent Destailleur
337d055872
Merge pull request #2199 from altatof/3.6
...
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
2015-01-06 00:10:08 +01:00
frederic34
e937039596
Merge remote branch 'upstream/develop' into printipp
2014-12-28 11:59:58 +01:00
Christophe Battarel
1ab6955494
FIX: dont remove price ht if it is forced (ie: calculated by margin rate
...
and cost price, or by external module)
2014-12-27 11:27:41 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
5215b1e641
Merge pull request #2186 from marcosgdf/bug-575
...
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
2014-12-26 04:02:01 +01:00
Marcos García de La Fuente
aec1bdb3c4
Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice
2014-12-25 23:08:07 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
frederic34
5cce8c45e3
WIP PrintIPP
2014-12-05 18:23:54 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
...
for release.
2014-12-04 13:20:56 +01:00
