Laurent Destailleur
|
908e5d7f0a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/api/class/api_setup.class.php
|
2020-04-29 18:05:01 +02:00 |
|
Laurent Destailleur
|
84bca036c9
|
FIX Link missing into email of some notification
|
2020-04-29 18:03:28 +02:00 |
|
Laurent Destailleur
|
a0c013d87b
|
Fix missing link
Conflicts:
htdocs/core/class/notify.class.php
|
2020-04-28 19:18:31 +02:00 |
|
Laurent Destailleur
|
c22e13b138
|
FIX Avoid infinite loop when a fetch is inside a compute field.
|
2020-04-28 14:27:51 +02:00 |
|
Laurent Destailleur
|
a8740352af
|
FIX Extrafields of type price must be '' and not '0' if not defined
|
2020-04-28 14:27:42 +02:00 |
|
Laurent Destailleur
|
91523b4b64
|
FIX Can switch from double to price type for extrafields
Conflicts:
htdocs/core/tpl/admin_extrafields_edit.tpl.php
|
2020-04-28 14:27:22 +02:00 |
|
Laurent Destailleur
|
fe6fb12d18
|
Fix missing link
|
2020-04-27 17:13:23 +02:00 |
|
Laurent Destailleur
|
635b9bb0fe
|
FIX #13641
|
2020-04-27 15:27:03 +02:00 |
|
Laurent Destailleur
|
ed045b2673
|
FIX #13749
|
2020-04-27 15:04:31 +02:00 |
|
Laurent Destailleur
|
17a4447ccb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-04-27 14:02:28 +02:00 |
|
Laurent Destailleur
|
ed63287797
|
Fix font
|
2020-04-27 14:02:18 +02:00 |
|
Laurent Destailleur
|
10ab97944a
|
Merge pull request #13752 from fmarcet/10.0
FIX: Wrong Sql on getListOfTowns api method
|
2020-04-27 11:42:19 +02:00 |
|
Laurent Destailleur
|
84353087b2
|
Merge pull request #13754 from atm-gauthier/11.0_fix_elementtype_2
FIX : Another "Access to undeclared static property: Contact::$table_…
|
2020-04-27 11:42:02 +02:00 |
|
gauthier
|
7f56c4a785
|
FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"
|
2020-04-27 11:18:53 +02:00 |
|
Ferran Marcet
|
b90a6024f5
|
FIX: Wrong Sql on getListOfTowns api method
|
2020-04-27 10:15:47 +02:00 |
|
Laurent Destailleur
|
6c3e5b19b4
|
Merge pull request #13745 from simicar29/11.0-erfetchlines
Properly assign ->id in expensereport fetch_lines
|
2020-04-25 18:18:01 +02:00 |
|
Marc Guenneugues
|
a040cd0305
|
Properly assign ->id in expensereport fetch_lines
|
2020-04-25 15:19:47 +02:00 |
|
Laurent Destailleur
|
fc1a1c6afe
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-04-24 19:56:29 +02:00 |
|
Laurent Destailleur
|
d11dcc35c3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/class/commonobject.class.php
|
2020-04-24 19:56:19 +02:00 |
|
Laurent Destailleur
|
6798e9e6f5
|
Fix remove warning missing the seller in update_price
|
2020-04-24 19:52:54 +02:00 |
|
Laurent Destailleur
|
df10b86d1f
|
FIX consistency of price w/wo vat wrong when price entered with tax
|
2020-04-24 19:52:34 +02:00 |
|
Laurent Destailleur
|
48245cf134
|
Merge pull request #13735 from atm-gauthier/11.0_fix_elementtype
FIX : Access to undeclared static property: Contact::$table_element
|
2020-04-24 19:02:11 +02:00 |
|
Laurent Destailleur
|
f6e2399f3c
|
Merge pull request #13736 from atm-florian/11.0
fix: remove php warning
|
2020-04-24 19:01:24 +02:00 |
|
Laurent Destailleur
|
4564a5cffd
|
Update accounting-files.php
|
2020-04-24 19:01:08 +02:00 |
|
florian HENRY
|
a685026756
|
fix: remove php warning
|
2020-04-24 17:22:35 +02:00 |
|
Laurent Destailleur
|
b77892451f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-04-24 16:21:58 +02:00 |
|
Laurent Destailleur
|
21665cdc85
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2020-04-24 16:21:51 +02:00 |
|
Laurent Destailleur
|
df91780552
|
FIX Situation invoice take into account the credit notes.
|
2020-04-24 15:57:08 +02:00 |
|
gauthier
|
e98671e404
|
FIX : Access to undeclared static property: Contact::$table_element
|
2020-04-24 15:22:38 +02:00 |
|
Laurent Destailleur
|
42ee9845ad
|
Report error
|
2020-04-24 15:21:02 +02:00 |
|
Laurent Destailleur
|
9764af7e9c
|
Merge pull request #13731 from simicar29/11.0-reception
Clean line extrafields when deleting reception
|
2020-04-24 15:16:51 +02:00 |
|
Laurent Destailleur
|
eda3643639
|
Merge pull request #13730 from simicar29/11.0-expedition
Clean line extrafields when deleting expedition
|
2020-04-24 15:16:41 +02:00 |
|
Laurent Destailleur
|
c96937d101
|
Merge pull request #13729 from simicar29/11.0-contrat
Clean line extrafields when deleting contrat
|
2020-04-24 15:16:29 +02:00 |
|
stickler-ci
|
ababad540a
|
Fixing style errors.
|
2020-04-23 17:29:52 +00:00 |
|
Laurent Destailleur
|
a90398af06
|
Merge pull request #13726 from simicar29/11.0-supplierproposal
Clean line extrafields when deleting supplier proposal
|
2020-04-23 19:27:39 +02:00 |
|
Laurent Destailleur
|
2fcb2ff19f
|
Merge pull request #13727 from simicar29/11.0-fichinter
Clean line extrafields when deleting fichinter
|
2020-04-23 19:27:22 +02:00 |
|
Marc Guenneugues
|
b4fbb86548
|
Clean line extrafields when deleting reception
|
2020-04-23 19:22:25 +02:00 |
|
Marc Guenneugues
|
3ea8d1895b
|
Clean line extrafields when deleting expedition
|
2020-04-23 19:09:05 +02:00 |
|
stickler-ci
|
b8a4c0d83b
|
Fixing style errors.
|
2020-04-23 17:02:57 +00:00 |
|
Marc Guenneugues
|
a70be95760
|
Clean line extrafields when deleting contrat
|
2020-04-23 19:00:47 +02:00 |
|
Laurent Destailleur
|
7f0e019c78
|
Merge pull request #13725 from simicar29/11.0-supplierorder
Clean line extrafields when deleting supplier order
|
2020-04-23 18:56:09 +02:00 |
|
stickler-ci
|
93735bf9cd
|
Fixing style errors.
|
2020-04-23 16:55:36 +00:00 |
|
Marc Guenneugues
|
285f215acf
|
Clean line extrafields when deleting fichinter
|
2020-04-23 18:52:45 +02:00 |
|
Laurent Destailleur
|
388e98fdf0
|
Merge pull request #13724 from simicar29/11.0-supplierinvoice
Clean line extrafields when deleting supplier invoice
|
2020-04-23 18:35:34 +02:00 |
|
Marc Guenneugues
|
ab5c2b1fd5
|
Clean line extrafields when deleting supplier proposal
|
2020-04-23 18:33:58 +02:00 |
|
Laurent Destailleur
|
922efaf49b
|
Merge pull request #13714 from simnandez/11.0
FIX: Error update SQL into stock reception
|
2020-04-23 18:31:11 +02:00 |
|
Laurent Destailleur
|
02c5530e1f
|
Update mouvementstock.class.php
|
2020-04-23 18:31:01 +02:00 |
|
stickler-ci
|
4b58213e5b
|
Fixing style errors.
|
2020-04-23 16:29:36 +00:00 |
|
Marc Guenneugues
|
64d877bc7b
|
Clean line extrafields when deleting supplier order
|
2020-04-23 18:27:06 +02:00 |
|
Laurent Destailleur
|
00e9ed1452
|
Merge pull request #13716 from atm-florian/11.0
fix: remove debug pring
|
2020-04-23 18:22:18 +02:00 |
|